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

@@ -36,7 +36,7 @@ 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;
}
@@ -57,17 +57,17 @@ void ClientConnection::addMessage(const WarehouseGuez::WsBiteInterface::Messages
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());
TRACE_LOG(m_logger) << "Send msg: " << msg;
TRACE_LOG() << "Send msg: " << msg;
m_socket->sendTextMessage(msg);
}
void ClientConnection::onNewTextMessageFromSocket(const QString &message)
{
DEBUG_LOG(m_logger) << "Recv msg: " << message;
DEBUG_LOG() << "Recv msg: " << message;
emit newTextMessage(this, message);
}
@@ -79,15 +79,15 @@ void ClientConnection::sendMessagesFromQueue()
{
Messages::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);
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 with ip "
DEBUG_LOG() << "Client with ip "
<< m_ip.toString()
<< " disconnected";
emit disconnected(this);
@@ -52,8 +52,6 @@ private: // attributes
QWebSocket *m_socket;
QQueue<Messages::ReplyMessage> m_messageQueue;
QHostAddress m_ip;
LOGGER_T m_logger;
}; // class ClientConnection
} // namespace Connection
} // namespace WsBiteInterface
@@ -21,7 +21,6 @@ using namespace WarehouseGuez::WsBiteInterface::Connection;
ConnectionHandler::ConnectionHandler()
: m_server(nullptr)
, m_logger(getLogger("ConnectionHandler"))
{
}
@@ -49,13 +48,13 @@ bool ConnectionHandler::init()
// TODO: read port from config?
int port = NGL::Connections::port(NGL::Connections::eConnection::LVS);
DEBUG_LOG(m_logger) << "Trying to listen to port " << port;
DEBUG_LOG() << "Trying to listen to port " << port;
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: " << port;
DEBUG_LOG() << "... ok - port: " << port;
return true;
}
@@ -67,7 +66,7 @@ void ConnectionHandler::onNewMessage(WarehouseGuez::WsBiteInterface::Messages::M
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()
@@ -79,7 +78,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;
@@ -89,7 +88,7 @@ void ConnectionHandler::onNewConnection()
connect(newConnection, &ClientConnection::disconnected, this, &ConnectionHandler::onDisconnected);
m_connections.append(newConnection);
DEBUG_LOG(m_logger) << "New client with ip " << newConnection->ip().toString() << " connected";
DEBUG_LOG() << "New client with ip " << newConnection->ip().toString() << " connected";
}
}
@@ -52,8 +52,6 @@ private Q_SLOTS:
private: // attributes
QWebSocketServer *m_server;
QVector<ClientConnection *> m_connections;
LOGGER_T m_logger;
};
} // namespace Connection
} // namespace WsBiteInterface