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;
@@ -137,7 +137,7 @@ bool ControlDialog::init(LtsSession::LtsSession *session,
if (info.addresses().size() > 0)
m_host = info.addresses().at(0);
else
ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
}
return true;
}
@@ -160,7 +160,7 @@ void ControlDialog::aboutToClose()
void ControlDialog::slotOnConnectClicked()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this;
if (!m_isConnected)
{
initWebSocketHandler();
@@ -178,9 +178,9 @@ void ControlDialog::slotOnConnectClicked()
m_webSocketClient->webSocket()->close();
}
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " connect clicked, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " connect clicked, this=" << this;
updateConnectButton();
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this;
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this;
}
void ControlDialog::slotOnLogoutClicked()
@@ -190,7 +190,7 @@ void ControlDialog::slotOnLogoutClicked()
m_webSocketClient->addReply((new LtsProjectionWorkstation::CTS::LogoutRequest(QUuid::createUuid().toString()))->toReplyMessage());
m_webSocketClient->webSocket()->close();
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " logout clicked, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " logout clicked, this=" << this;
updateConnectButton();
}
@@ -210,7 +210,7 @@ void ControlDialog::slotOnWebSocketConnected()
if (workspaceIdToUse.isEmpty())
{
workspaceIdToUse = QUuid::createUuid().toString();
INFO_LOG(m_logger) << "workspaceIdToUse " << workspaceIdToUse;
INFO_LOG() << "workspaceIdToUse " << workspaceIdToUse;
}
m_opmIfc->callWorkspaceSaveUnsaved(workspaceIdToUse);
LtsUtils::OperatorSettings* opSettings = LtsUtils::OperatorSettings::getInstance();
@@ -229,7 +229,7 @@ void ControlDialog::slotOnWebSocketConnected()
INFO_LOG(m_logger) << " connect userId=" << userId
INFO_LOG() << " connect userId=" << userId
<< ", with prio=" << user.projectionPriority()
<< ", PwsWorkspace/Id='" << workspaceIdToUse << "'";
@@ -244,7 +244,7 @@ void ControlDialog::slotOnWebSocketConnected()
void ControlDialog::slotOnVncDisconnected()
{
INFO_LOG(m_logger) << " slotOnVncDisconnected";
INFO_LOG() << " slotOnVncDisconnected";
if (m_webSocketClient)
{
@@ -255,7 +255,7 @@ void ControlDialog::slotOnVncDisconnected()
if (!m_ui || !m_ui->pbnConnect)
return;
m_ui->pbnConnect->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " VNC disconnected, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " VNC disconnected, this=" << this;
updateConnectButton();
}
@@ -267,18 +267,18 @@ void ControlDialog::slotOnWebSocketDisconnected()
m_isConnected = false;
if (m_ui && m_ui->pbnConnect)
m_ui->pbnConnect->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " WEBSOCKET disconnected, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " WEBSOCKET disconnected, this=" << this;
updateConnectButton();
}
void ControlDialog::slotOnWebSocketError()
{
ERROR_LOG(m_logger) << m_webSocketClient->webSocket()->errorString();
ERROR_LOG() << m_webSocketClient->webSocket()->errorString();
LtsWidgets::LtsMessageDialog::showMessage(this, m_webSocketClient->webSocket()->errorString(), tr("Connection to the presentation workstation failed!"));
m_isConnected = false;
m_ui->pbnConnect->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " VWEBSOCKET ERROR, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " VWEBSOCKET ERROR, this=" << this;
updateConnectButton();
}
@@ -299,7 +299,7 @@ void ControlDialog::slotCbxWorkstationsChanged()
if (info.addresses().size() > 0)
m_host = info.addresses().at(0);
else
ERROR_LOG(m_logger) << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
ERROR_LOG() << "Address for host " << m_ui->cbxWorkstations->currentText() << " not found!";
}
@@ -324,14 +324,14 @@ void ControlDialog::fillCombobox()
void ControlDialog::updateConnectButton()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this
TRACE_LOG() << Q_FUNC_INFO << " START, this=" << this
<< ", m_isConnected=" << m_isConnected
<< ", pbnConnect->text()=" << m_ui->pbnConnect->text();
if (!m_ui)
return;
m_ui->pbnConnect->setText(m_isConnected ? tr("Disonnect") : tr("Connect"));
m_ui->pbnLogout->setEnabled(m_isConnected);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this
TRACE_LOG() << Q_FUNC_INFO << " END, this=" << this
<< ", m_isConnected=" << m_isConnected
<< ", pbnConnect->text()=" << m_ui->pbnConnect->text();
}
@@ -358,7 +358,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
LtsWidgets::LayoutArea::eDialogTab, false, false);
}
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " LoginSuccessful YES, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful YES, this=" << this;
m_isConnected = true;
m_ui->pbnConnect->setEnabled(true);
updateConnectButton();
@@ -377,7 +377,7 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
}
LtsWidgets::LtsMessageDialog::showMessage(this, errMsg, tr("Login failed!"));
DEBUG_LOG(m_logger) << LOGFUNCTION << " LoginSuccessful NO, this=" << this;
DEBUG_LOG() << Q_FUNC_INFO << " LoginSuccessful NO, this=" << this;
m_isConnected = false;
m_ui->pbnConnect->setEnabled(true);
updateConnectButton();
@@ -388,13 +388,13 @@ void ControlDialog::handleMessage(LtsWebSocket::AbstractClientMessage *message)
LtsProjectionWorkstation::STC::DedicatedDisconnect *disconnect = dynamic_cast<LtsProjectionWorkstation::STC::DedicatedDisconnect *>(message);
if (disconnect)
{
INFO_LOG(m_logger) << " DedicatedDisconnect.. "
INFO_LOG() << " DedicatedDisconnect.. "
<< ", getOperatorId=" << LtsSessionData::LtsSessionData::getInstance()->getOperatorId()
<< ", disconnect->userid()=" << disconnect->userid();
if ( (disconnect->userid() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId()) && m_isConnected)
{
slotOnWebSocketDisconnected();
INFO_LOG(m_logger) << " DedicatedDisconnect.. done";
INFO_LOG() << " DedicatedDisconnect.. done";
@@ -32,7 +32,7 @@ bool OperatorSettingsLoader::init(LtsSession::LtsSession *session)
{
if (!session->getFtc<OperatorManagement::DataInterface>(m_opmFtc))
{
ERROR_LOG(m_logger) << "Failed to load OperatorManagement FTC!";
ERROR_LOG() << "Failed to load OperatorManagement FTC!";
return false;
}
return true;
@@ -31,8 +31,7 @@ private:
bool loadOperatorRights();
LtsProjectionWorkstation::LOGGER_T m_logger;
LtsProjectionWorkstation::
std::shared_ptr<OperatorManagement::Interface::Ftc> m_opmFtc;
LtsUtils::RequestHelper *m_requestHelper;
@@ -72,7 +72,7 @@ void VncViewerDialog::retranslate()
void VncViewerDialog::handleServerCuttext(const QString &cutText)
{
DEBUG_LOG(m_logger) << "Got cuttext: " << cutText;
DEBUG_LOG() << "Got cuttext: " << cutText;
}
void VncViewerDialog::slotOnDisconnected()
@@ -240,7 +240,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
{
if (rect.pixelData.isEmpty())
{
WARNING_LOG(m_logger) << "No valid vnc pixel data... skipping frame";
WARNING_LOG() << "No valid vnc pixel data... skipping frame";
continue;
}
QImage img(reinterpret_cast<const unsigned char *>(rect.pixelData.data()),
@@ -249,7 +249,7 @@ void VncRenderAreaWorker::onRfbFrameBufferUpdate(const QVector<RfbProtocol::RfbR
QImage::Format_RGB32);
if (img.isNull())
{
WARNING_LOG(m_logger) << "Could not decode image data... skipping vnc frame";
WARNING_LOG() << "Could not decode image data... skipping vnc frame";
continue;
}
painter.drawImage(QPoint(rect.xpos, rect.ypos), img);
@@ -39,7 +39,7 @@ private:
mutable QMutex m_mutex;
QSize m_scaledSize;
QSize m_scaledSizeAspectRatio;
LtsProjectionWorkstation::LOGGER_T m_logger;
LtsProjectionWorkstation::
};
class VncRenderArea : public QOpenGLWidget, protected QOpenGLFunctions
@@ -74,7 +74,7 @@ private:
QOpenGLFramebufferObject *m_fbo;
QOpenGLTextureBlitter m_blitter;
LtsProjectionWorkstation::LOGGER_T m_logger;
LtsProjectionWorkstation::
};
@@ -127,7 +127,7 @@ private:
QString m_name;
bool m_isConnected;
LtsProjectionWorkstation::LOGGER_T m_logger;
LtsProjectionWorkstation::
};
}