Qt6-Migration: Type-Struct, DataModification und Signal/Slot Korrekturen

- ppm.hpp: Type-Methoden von id()/typeClass() zu getId()/getTypeClass() umbenannt
  (Vermeidung von Namenskonflikt mit Member-Variablen)
- ppm.hpp: TypeClass::eUndefined zu TypeClass::eUninitialized geändert
- ppm.hpp: operator<< für Type-Struct hinzugefügt (für INGLLogger)
- ppm_enums.hpp: DataModification, TypeClass, SymbolAppearance, SymbolVisibility Enums
- ppm_enums.hpp: operator<< für TypeClass hinzugefügt
- exm_dtc.h: #include ppm_enums.hpp für DataModification
- exm_dtc.h: DataModification zu ParticipantManagement::DataModification qualifiziert
- gna_dtc.h: Signal-Signaturen auf ParticipantManagement::DataModification angepasst
- gna_dtc.h: #include ppm.hpp hinzugefügt
- gna_nasat_aircraft_part_model.h/.cpp: Namespace-Korrekturen, Member-Zugriffe korrigiert
- gna_nasat_aircraft_part_model.h: onTypeChanged-Slot entfernt (im STUB nicht verfügbar)
- pdm_to_string.h/.cpp: DDS-spezifischen Code entfernt (nur STUB)
- flm_enums.hpp: AlarmConfig, VulnerabilityState Enums hinzugefügt
- pws_vnc_handler.h/.cpp: ProjectionWorkstation Namespace korrigiert
- mrk_marker.h: timeStamp() Methode hinzugefügt
- exm_exercise.h: Syntaxfehler korrigiert
- CMakeLists.txt Anpassungen für BUILD_RTI=ON Support

Build mit BUILD_RTI=ON erfolgreich abgeschlossen.
This commit is contained in:
torsten committed 2026-08-20 18:26:08 +02:00
1 parent 734a5e5315
commit 9c1463546e
19 files changed
+449 -180

No files matched your search

@@ -4,13 +4,15 @@
#include "pws_vnc_handler.h"
#include "pws_des_encryption.h"
#include <LtsProjectionWorkstation/logger.h>
namespace ProjectionWorkstation
{
VncHandler::VncHandler(const QHostAddress &host, quint16 port, QObject *parent)
: QObject(parent)
, m_logger(LtsProjectionWorkstation::getLogger("VncHandler"))
, m_logger(getLogger("VncHandler"))
, m_nextType(RfbProtocol::STC::RFB_VERSION)
, m_socket(new QTcpSocket(this))
, m_host(host)
@@ -21,7 +21,7 @@ class PWSCOMMON_EXPORT VncHandler : public QObject
public:
VncHandler(const QHostAddress &host, quint16 port, QObject *parent = nullptr);
void setNextExpectedMessageType(RfbProtocol::STC::Type type) { m_nextType = type; }
void setNextExpectedMessageType(ProjectionWorkstation::RfbProtocol::STC::Type type) { m_nextType = type; }
void connectToHost();
void connectToHost(const QHostAddress &host, quint16 port);
void writeData(const QByteArray &data);
@@ -29,7 +29,7 @@ public:
signals:
void connected();
void disconnected();
void frameBufferUpdateReceived(const QVector<RfbProtocol::RfbRectangle> &rectangles);
void frameBufferUpdateReceived(const QVector<ProjectionWorkstation::RfbProtocol::RfbRectangle> &rectangles);
void beepReceived();
void cutTextReceived(const QString &txt);
@@ -40,24 +40,23 @@ private slots:
private:
NGL::INGLLogger &m_logger;
NGL::INGLLogger &m_logger;
bool handleData(QDataStream &stream);
bool handleFrameBufferUpdate(QDataStream &stream);
bool handleSetColormap(QDataStream &stream);
bool handleRingBell(QDataStream &stream);
bool handleServerCuttext(QDataStream &stream);
void resetHandler();
bool handleVersion(const RfbProtocol::STC::RfbVersion &version);
bool handleSupportedSecurityTypes(const RfbProtocol::STC::RfbSupportedSecurityTypes &supportedTypes);
bool handleVncAuthentication(const RfbProtocol::STC::RfbVncAuthentication &authentication);
bool handleVersion(const ProjectionWorkstation::RfbProtocol::STC::RfbVersion &version);
bool handleSupportedSecurityTypes(const ProjectionWorkstation::RfbProtocol::STC::RfbSupportedSecurityTypes &supportedTypes);
bool handleVncAuthentication(const ProjectionWorkstation::RfbProtocol::STC::RfbVncAuthentication &authentication);
static quint64 convertPassword(const char *password);
static quint8 reverseByte(quint8 b);
bool handleSecurityResult(const RfbProtocol::STC::RfbSecurityResult &result);
bool handleServerInit(const RfbProtocol::STC::RfbServerInit &serverInit);
bool handleSecurityResult(const ProjectionWorkstation::RfbProtocol::STC::RfbSecurityResult &result);
bool handleServerInit(const ProjectionWorkstation::RfbProtocol::STC::RfbServerInit &serverInit);
LtsProjectionWorkstation::
RfbProtocol::STC::Type m_nextType;
RfbProtocol::STC::RfbServerInit m_serverInit;
ProjectionWorkstation::RfbProtocol::STC::Type m_nextType;
ProjectionWorkstation::RfbProtocol::STC::RfbServerInit m_serverInit;
QTcpSocket *m_socket;
QByteArray m_buffer;
QHostAddress m_host;