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:
2785 files changed
+18754
-18316
No files matched your search
@@ -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"));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user