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
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user