Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install

- LtsWidgets: Fixed Qt6 API compatibility issues
  - QWheelEvent::delta() → angleDelta().y()
  - QStyleOption::init() → initFrom()
  - QComboBox activated signal signature change
  - QTextCodec removal (UTF-8 default in Qt6)
  - Missing widget includes added

- LtsWebSocket: Fixed m_logger reference initialization
  - Added NGLLoggerBootstrap includes
  - Proper initialization in constructor initializer lists

- CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion

- Docker: RTI Connext permanent installation script added
  - ci/install-rti-in-docker.sh for persistent RTI setup
  - Removes need for volume mounting RTI into container

- BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket
  can be disabled for partial builds during migration

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-19 14:04:26 +02:00
1 parent 3bb6e89496
commit bafed3705f
69 files changed
+12765 -14202

No files matched your search

+41 -82
View File
@@ -1,128 +1,87 @@
#pragma once
#include "tcpserver_export.h"
#include <QByteArray>
#include <QMap>
#include <QPointer>
#include <QObject>
#include "sv_export.h"
#include <QPointer>
class QAbstractSocket;
class CommandInterface;
class TCPSERVER_EXPORT WorkerBase
{
public:
typedef QMap< QByteArray, CommandInterface *> CommandMap;
public:
public:
typedef QMap<QByteArray, CommandInterface*> CommandMap;
WorkerBase(qintptr sd, unsigned short port);
public:
WorkerBase(qintptr sd, unsigned short port);
virtual ~WorkerBase() = default;
virtual ~WorkerBase() = default;
QAbstractSocket *connection();
QAbstractSocket* connection();
const QAbstractSocket* connection() const;
const QAbstractSocket *connection() const;
void redirectDataHandling(bool bDoRedirect, CommandInterface* newDataHandler = nullptr);
static QByteArray formatForDebug(const QByteArray& data);
void redirectDataHandling(bool bDoRedirect, CommandInterface *newDataHandler = nullptr);
static QByteArray formatForDebug(const QAbstractSocket* dev);
CommandMap getCommands() const;
static QByteArray formatForDebug(const QByteArray &data);
protected:
void newDataInternal();
int initCommands(unsigned short port);
static QByteArray formatForDebug(const QAbstractSocket *dev);
void cleanupCommands();
qintptr m_socketDescriptor;
CommandMap getCommands() const;
QPointer<QAbstractSocket> m_connection;
protected:
unsigned short m_port;
void newDataInternal();
QByteArray m_connString;
int initCommands(unsigned short port);
bool m_bRedirectIncomingData;
CommandInterface* m_bRedirectDataHandler;
void cleanupCommands();
qintptr m_socketDescriptor;
QPointer<QAbstractSocket> m_connection;
unsigned short m_port;
QByteArray m_connString;
bool m_bRedirectIncomingData;
CommandInterface *m_bRedirectDataHandler;
CommandMap m_registeredCommands;
CommandMap m_registeredCommands;
};
class WorkerInstance final : public QObject, public WorkerBase
{
Q_OBJECT
public:
WorkerInstance(qintptr sd, unsigned short port, QObject *parent = nullptr);
virtual ~WorkerInstance();
Q_OBJECT
public:
WorkerInstance(qintptr sd, unsigned short port, QObject* parent = nullptr);
virtual ~WorkerInstance();
bool isRunning() const;
bool isRunning() const;
bool isFinished() const;
bool isFinished() const;
public Q_SLOTS:
public Q_SLOTS:
void quit();
void quit();
void doWork();
protected Q_SLOTS:
void doWork();
void newData();
protected Q_SLOTS:
void connectionDisconnected();
void newData();
Q_SIGNALS:
void finished();
void connectionDisconnected();
Q_SIGNALS:
void finished();
private:
bool m_bFinished;
private:
bool m_bFinished;
};