Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -10,13 +10,12 @@ namespace LtsWebSocket
ClientConnection::ClientConnection(QWebSocket *socket, QObject *parent)
: QThread(parent)
, m_socket(socket ? socket : new QWebSocket)
, m_logger(getLogger("ClientConnection"))
{
}
ClientConnection::~ClientConnection()
{
DEBUG_LOG(m_logger) << "Thread closed" << this;
DEBUG_LOG() << "Thread closed" << this;
delete m_socket;
qDeleteAll(m_messageQueue);
}
@@ -25,11 +24,11 @@ bool ClientConnection::init()
{
if (m_socket == nullptr)
{
ERROR_LOG(m_logger) << "Initialisation failed due to an invalid socket";
ERROR_LOG() << "Initialisation failed due to an invalid socket";
return false;
}
DEBUG_LOG(m_logger) << "Started new thread" << this;
DEBUG_LOG() << "Started new thread" << this;
connect(m_socket, &QWebSocket::textMessageReceived, this, &ClientConnection::onNewTextMessageFromSocket, Qt::DirectConnection);
connect(m_socket, &QWebSocket::connected, this, &ClientConnection::sendMessagesFromQueue);
connect(m_socket, &QWebSocket::disconnected, this, &ClientConnection::onSocketDisconnect);
@@ -42,24 +41,24 @@ void ClientConnection::addReply(ReplyMessage *message)
if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
{
m_messageQueue.enqueue(message);
DEBUG_LOG(m_logger) << "Adding message to queue, size: " << m_messageQueue.size();
DEBUG_LOG() << "Adding message to queue, size: " << m_messageQueue.size();
return;
}
const QString msg(message->toJsonString());
DEBUG_LOG(m_logger) << "Sending message: " << msg ;
DEBUG_LOG() << "Sending message: " << msg ;
m_socket->sendTextMessage(msg);
delete message;
}
void ClientConnection::onNewTextMessageFromSocket(const QString &message)
{
DEBUG_LOG(m_logger) << "Recv msg: " << message << this;
DEBUG_LOG() << "Recv msg: " << message << this;
emit newTextMessage(this, message);
}
void ClientConnection::sendMessagesFromQueue()
{
INFO_LOG(m_logger) << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
INFO_LOG() << "Client connected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
if (m_socket->state() != QAbstractSocket::ConnectedState)
return;
@@ -67,16 +66,16 @@ void ClientConnection::sendMessagesFromQueue()
{
ReplyMessage *message = m_messageQueue.dequeue();
const QString msg(message->toJsonString());
TRACE_LOG(m_logger) << "Send msg: " << msg;
TRACE_LOG() << "Send msg: " << msg;
m_socket->sendTextMessage(msg);
delete message;
DEBUG_LOG(m_logger) << "Sent message from queue, new size: " << m_messageQueue.size();
DEBUG_LOG() << "Sent message from queue, new size: " << m_messageQueue.size();
}
}
void ClientConnection::onSocketDisconnect()
{
DEBUG_LOG(m_logger) << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
DEBUG_LOG() << "Client disconnected ip: " << m_socket->peerAddress().toString() << ":" << m_socket->peerPort();
exit(0);
emit disconnected(this);
}
@@ -8,7 +8,7 @@
#include "reply_message.h"
#include "logger.h"
#include <LtsWebSocket/ltswebsocketserver_export.h>
#include "ltswebsocketserver_export.h"
class QWebSocket;
@@ -63,9 +63,5 @@ private:
private:
QWebSocket *m_socket;
QQueue<ReplyMessage *> m_messageQueue;
LOGGER_T m_logger;
};
}
@@ -2,7 +2,7 @@
#pragma once
#include <LtsWebSocket/ltswebsocketcommon_export.h>
#include "ltswebsocketcommon_export.h"
#include "reply_message.h"
#include <QString>
@@ -4,7 +4,7 @@
#include "client_message.h"
#include "reply_message.h"
#include <LtsWebSocket/ltswebsocketcommon_export.h>
#include "ltswebsocketcommon_export.h"
#include <QString>
#include <QJsonParseError>
@@ -46,8 +46,6 @@ protected:
int m_typeId;
QString m_uuid;
QJsonValue m_data;
NGL::INGLLogger &m_logger;
};
class PongMessage final : public ReplyMessage
@@ -12,7 +12,6 @@ using namespace LtsWebSocket;
ConnectionHandler::ConnectionHandler(QObject *parent)
: QObject(parent)
, m_server(nullptr)
, m_logger(getLogger("ConnectionHandler"))
{}
ConnectionHandler::~ConnectionHandler()
@@ -34,13 +33,13 @@ bool ConnectionHandler::init(const QString &serviceName, unsigned short port)
connect(m_server, &QWebSocketServer::newConnection, this, &ConnectionHandler::onNewConnection);
connect(m_server, &QWebSocketServer::serverError, this, &ConnectionHandler::onServerError);
DEBUG_LOG(m_logger) << "Trying to listen ";
DEBUG_LOG() << "Trying to listen ";
if (!m_server->listen(QHostAddress::Any, port))
{
ERROR_LOG(m_logger) << "Not possible to listen to port " << port;
ERROR_LOG() << "Not possible to listen to port " << port;
return false;
}
DEBUG_LOG(m_logger) << "... ok, port " << m_server->serverPort();
DEBUG_LOG() << "... ok, port " << m_server->serverPort();
return true;
}
@@ -55,7 +54,7 @@ void ConnectionHandler::sendToAllClients(ReplyMessage *message)
void ConnectionHandler::onServerError(QWebSocketProtocol::CloseCode closeCode)
{
ERROR_LOG(m_logger) << "Got server error with close code " << closeCode;
ERROR_LOG() << "Got server error with close code " << closeCode;
}
void ConnectionHandler::onNewConnection()
@@ -72,7 +71,7 @@ void ConnectionHandler::onNewConnection()
if (!newConnection->init())
{
ERROR_LOG(m_logger) << "Failed to initialise new client";
ERROR_LOG() << "Failed to initialise new client";
delete newConnection;
newConnection = nullptr;
continue;
@@ -85,6 +84,6 @@ void ConnectionHandler::onNewConnection()
m_connections.insert(newConnection);
emit clientConnected(newConnection);
INFO_LOG(m_logger) << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort();
INFO_LOG() << "New client connected ip: " << socket->localAddress().toString() << ":" << socket->localPort();
}
}
@@ -59,7 +59,5 @@ private slots:
private:
QWebSocketServer *m_server;
QSet<ClientConnection *> m_connections;
LOGGER_T m_logger;
};
}
@@ -31,7 +31,7 @@ protected:
if (!m_dbInterface->select(dataVec))
{
const QString errorMessage = QStringLiteral("Error reading data from database!");
ERROR_LOG(m_logger) << errorMessage;
ERROR_LOG() << errorMessage;
ErrorMessage::ErrorData errData;
errData.errorMessage = errorMessage;
errData.uuid = uuid;
@@ -41,8 +41,7 @@ protected:
return new MessageType (m_dbInterface->template toJson<DbType>(dataVec), uuid);
}
protected:
NGL::INGLLogger &m_logger;
protected:
std::shared_ptr<T> m_dbInterface;
};
}
@@ -3,7 +3,7 @@
#pragma once
#include <LtsWebSocket/ltswebsocketcommon_export.h>
#include "ltswebsocketcommon_export.h"
#include <NGLLogger/INGLLogger.h>
namespace LtsWebSocket
@@ -37,7 +37,6 @@ private:
AbstractClientMessageFactory *m_messageFactory;
LtsWebSocketClient *m_webSocketClient;
QWebSocket *m_socket;
NGL::INGLLogger &m_logger;
};
WebSocketHelper::WebSocketHelper(AbstractClientMessageFactory *messageFactory,
@@ -72,18 +71,18 @@ void WebSocketHelper::doOpen(const QString &hostname, const unsigned short port)
doClose();
else
{
INFO_LOG(m_logger) << "Web socket to url: " << url.toDisplayString() << " is already open.";
INFO_LOG() << "Web socket to url: " << url.toDisplayString() << " is already open.";
return;
}
}
INFO_LOG(m_logger) << "Opening web socket to url: " << url.toDisplayString();
INFO_LOG() << "Opening web socket to url: " << url.toDisplayString();
m_socket->open(url);
}
void WebSocketHelper::doClose()
{
INFO_LOG(m_logger) << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString();
INFO_LOG() << "Closing web socket to url:" << m_socket->requestUrl().toDisplayString();
m_socket->close();
}
@@ -91,29 +90,29 @@ void WebSocketHelper::doSendTextMessage(const QString &msg)
{
if (!m_socket || m_socket->state() != QAbstractSocket::ConnectedState)
{
ERROR_LOG(m_logger) << "Message could not be send, socket is not connected.";
ERROR_LOG() << "Message could not be send, socket is not connected.";
return;
}
DEBUG_LOG(m_logger) << "Sending message: " << msg;
DEBUG_LOG() << "Sending message: " << msg;
m_socket->sendTextMessage(msg);
}
void WebSocketHelper::onConnected()
{
INFO_LOG(m_logger) << "Connected to server url: " << m_socket->requestUrl().toDisplayString()
INFO_LOG() << "Connected to server url: " << m_socket->requestUrl().toDisplayString()
<< " using local port: " << m_socket->localPort();
emit connected();
}
void WebSocketHelper::onDisconnected()
{
INFO_LOG(m_logger) << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString();
INFO_LOG() << "Disconnected from server url: " << m_socket->requestUrl().toDisplayString();
emit disconnected();
}
void WebSocketHelper::onError(QAbstractSocket::SocketError error)
{
ERROR_LOG(m_logger) << "Error occured: " << error << " closing socket.";
ERROR_LOG() << "Error occured: " << error << " closing socket.";
m_socket->close();
}
@@ -132,7 +131,7 @@ void WebSocketHelper::parseMessage(const QString &message)
clientMessage = m_messageFactory->createMessage(m_webSocketClient, message);
else
{
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << message
WARNING_LOG() << "Could not parse incoming message: '" << message
<< "', error: " << result.errorString();
clientMessage = new InvalidMessage(m_webSocketClient, QString(),
QStringLiteral("Got message which is not JSON conform (%1)").arg(result.errorString()));
@@ -148,7 +147,6 @@ LtsWebSocketClient::LtsWebSocketClient(AbstractClientMessageFactory *messageFact
: QObject(parent)
, m_messageFactory(messageFactory)
, m_webSocketHelperThread(new QThread(this))
, m_logger(getLogger("LtsWebSocketClient"))
{
m_webSocketHelper = new WebSocketHelper(m_messageFactory, this, m_logger);
m_webSocketHelper->moveToThread(m_webSocketHelperThread);
@@ -5,7 +5,7 @@
#include <QObject>
#include <QAbstractSocket>
#include <LtsWebSocket/ltswebsocketclient_export.h>
#include "ltswebsocketclient_export.h"
#include "client_message_factory.h"
#include "logger.h"
@@ -60,8 +60,5 @@ private:
QThread *m_webSocketHelperThread;
WebSocketHelper *m_webSocketHelper;
LOGGER_T m_logger;
};
}
@@ -14,7 +14,6 @@ LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory *messageFact
, m_queueTimer(new QTimer(this))
, m_messageFactory(messageFactory)
, m_connectionHandler(nullptr)
, m_logger(getLogger("LtsWebSocketServer"))
{
connect(m_queueTimer, &QTimer::timeout,
this, &LtsWebSocketServer::onQueueTimerTimeout);
@@ -30,7 +29,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const unsigned short p
if (!m_connectionHandler->init(serviceName, port))
{
ERROR_LOG(m_logger) << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port));
ERROR_LOG() << "Could not init m_connectionHandler with servicename: " << serviceName << ((port == 0) ? QStringLiteral(" random port") : QStringLiteral(" port: ") + QString::number(port));
m_connectionHandler.reset();
return false;
}
@@ -60,7 +59,7 @@ bool LtsWebSocketServer::init(const QString &serviceName, const QPair<quint16, q
void LtsWebSocketServer::sendToAllClients(ReplyMessage *message)
{
DEBUG_LOG(m_logger) << "Sending message to all clients: " << message->toJsonString();
DEBUG_LOG() << "Sending message to all clients: " << message->toJsonString();
m_connectionHandler->sendToAllClients(message);
}
@@ -82,7 +81,7 @@ void LtsWebSocketServer::onNewTextMessage(ReplyHandler *client, const QString &m
client->addReply(new PongMessage(message.mid(pingMsg.size())));
return;
}
DEBUG_LOG(m_logger) << "Got new message: " << message;
DEBUG_LOG() << "Got new message: " << message;
m_messageQueue.append({client, message});
@@ -103,7 +102,7 @@ void LtsWebSocketServer::onQueueTimerTimeout()
clientMessage = m_messageFactory->createMessage(credentials.client, credentials.message);
else
{
WARNING_LOG(m_logger) << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString();
WARNING_LOG() << "Could not parse incoming message: '" << credentials.message << "', error: " << result.errorString();
clientMessage = new InvalidMessage(credentials.client, QString(), QStringLiteral("Got message which is not JSON conform"));
}
@@ -5,7 +5,7 @@
#include <QtCore/QObject>
#include <LtsWebSocket/ltswebsocketserver_export.h>
#include "ltswebsocketserver_export.h"
#include "client_message_factory.h"
#include "logger.h"
#include <memory>
@@ -2,7 +2,7 @@
#pragma once
#include <LtsWebSocket/ltswebsocketcommon_export.h>
#include "ltswebsocketcommon_export.h"
#include <QString>
#include <QJsonObject>