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

@@ -61,10 +61,10 @@ bool VncHandler::handleData(QDataStream &stream)
if (handleVersion(version))
{
setNextExpectedMessageType(RfbProtocol::STC::RFB_SUP_SECURITY_TYPES);
DEBUG_LOG(m_logger) << "RfbVersion handled Successfully!";
DEBUG_LOG() << "RfbVersion handled Successfully!";
return true;
}
ERROR_LOG(m_logger) << "RfbVersion handshake Error!";
ERROR_LOG() << "RfbVersion handshake Error!";
break;
}
@@ -78,10 +78,10 @@ bool VncHandler::handleData(QDataStream &stream)
if (handleSupportedSecurityTypes(supTypes))
{
setNextExpectedMessageType(RfbProtocol::STC::RFB_VNC_AUTHENTICATION);
DEBUG_LOG(m_logger) << "RfbSecurityType handled Successfully!";
DEBUG_LOG() << "RfbSecurityType handled Successfully!";
return true;
}
ERROR_LOG(m_logger) << "RfbSecurityType handshake Error!";
ERROR_LOG() << "RfbSecurityType handshake Error!";
break;
}
@@ -95,10 +95,10 @@ bool VncHandler::handleData(QDataStream &stream)
if (handleVncAuthentication(auth))
{
setNextExpectedMessageType(RfbProtocol::STC::RFB_SECURITY_RESULT);
DEBUG_LOG(m_logger) << "RfbVncAuthentication handled Successfully!";
DEBUG_LOG() << "RfbVncAuthentication handled Successfully!";
return true;
}
ERROR_LOG(m_logger) << "RfbVncAuthentication Error!";
ERROR_LOG() << "RfbVncAuthentication Error!";
break;
}
@@ -112,10 +112,10 @@ bool VncHandler::handleData(QDataStream &stream)
if (handleSecurityResult(result))
{
setNextExpectedMessageType(RfbProtocol::STC::RFB_SERVER_INIT);
DEBUG_LOG(m_logger) << "RfbSecurityResult handled Successfully!";
DEBUG_LOG() << "RfbSecurityResult handled Successfully!";
return true;
}
ERROR_LOG(m_logger) << "RfbSecurityResult Error!";
ERROR_LOG() << "RfbSecurityResult Error!";
break;
}
@@ -140,7 +140,7 @@ bool VncHandler::handleData(QDataStream &stream)
emit connected();
m_socket->write(RfbProtocol::CTS::RfbFrameBufferUpdateRequest(false, 0, 0, 1920, 1200));
setNextExpectedMessageType(RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE);
DEBUG_LOG(m_logger) << "RfbServerInit handled Successfully!";
DEBUG_LOG() << "RfbServerInit handled Successfully!";
}
return true;
}
@@ -155,7 +155,7 @@ bool VncHandler::handleData(QDataStream &stream)
stream.startTransaction();
quint8 msgType;
stream >> msgType;
DEBUG_LOG(m_logger) << "got message from server: " << QString::number(msgType, 16);
DEBUG_LOG() << "got message from server: " << QString::number(msgType, 16);
switch (msgType)
{
case RfbProtocol::STC::RFB_FRAMEBUFFER_UPDATE:
@@ -167,7 +167,7 @@ bool VncHandler::handleData(QDataStream &stream)
case RfbProtocol::STC::RFB_SERVER_CUTTEXT:
return handleServerCuttext(stream);
default:
WARNING_LOG(m_logger) << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
WARNING_LOG() << "Unknown message type from server (" << QString::number(msgType, 16) << ") - reconnecting";
stream.abortTransaction();
slotOnDisconnected();
return false;
@@ -241,7 +241,7 @@ void VncHandler::writeData(const QByteArray &data)
void VncHandler::error()
{
ERROR_LOG(m_logger) << "SocketError " << m_socket->errorString();
ERROR_LOG() << "SocketError " << m_socket->errorString();
}
void VncHandler::resetHandler()
@@ -261,7 +261,7 @@ bool VncHandler::handleVersion(const RfbProtocol::STC::RfbVersion &version)
version.minorVersion()));
return true;
}
ERROR_LOG(m_logger) << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
ERROR_LOG() << "Unsupported Version: " << version.majorVersion() << "." << version.minorVersion();
return false;
}
@@ -276,7 +276,7 @@ bool VncHandler::handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupport
for (quint8 type : supportedTypes.types())
typesString.append(QString::number(type)).append(QLatin1Char(' '));
if (typesString.isEmpty()) typesString = QStringLiteral("EMPTY");
ERROR_LOG(m_logger) << "Unsupported Security Types: " << typesString;
ERROR_LOG() << "Unsupported Security Types: " << typesString;
return false;
}
@@ -327,7 +327,7 @@ bool VncHandler::handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult
}
else
{
ERROR_LOG(m_logger) << result.reason();
ERROR_LOG() << result.reason();
return false;
}
}
@@ -9,7 +9,7 @@
#include <QDataStream>
#include <QHostAddress>
#include <Plugins/ProjectionWorkstation/Common/pwscommon_export.h>
#include <Lts/Plugins/ProjectionWorkstation/Common/pwscommon_export.h>
#include <LtsProjectionWorkstation/logger.h>
namespace ProjectionWorkstation
@@ -53,7 +53,7 @@ private:
bool handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult &result);
bool handleServerInit(const RfbProtocol::STC::RfbServerInit &serverInit);
LtsProjectionWorkstation::LOGGER_T m_logger;
LtsProjectionWorkstation::
RfbProtocol::STC::Type m_nextType;
RfbProtocol::STC::RfbServerInit m_serverInit;
QTcpSocket *m_socket;