Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* Websocket interface for building control unit
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-01-30
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTcpServer>
|
||||
#include "logger.h"
|
||||
#include "abstract_socket_handler.h"
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
class TcpSocketHandler : public AbstractSocketHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TcpSocketHandler(QObject *parent = nullptr);
|
||||
|
||||
bool init(quint16 listenPort) override;
|
||||
bool isConnected() const override
|
||||
{
|
||||
return !m_tcpSockets.isEmpty();
|
||||
}
|
||||
protected:
|
||||
bool sendTelegramInternal(const QByteArray &tele) override;
|
||||
QByteArray parseBuffer(const QByteArray &buffer);
|
||||
static bool findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos);
|
||||
static bool findNextSyncEndByte(const QByteArray &buffer, int &iCurReadPos);
|
||||
|
||||
private Q_SLOTS:
|
||||
void onNewConnection();
|
||||
void onTcpSocketDisconnected();
|
||||
void onReadyRead();
|
||||
private:
|
||||
QTcpServer *m_tcpSocketServer;
|
||||
QHash<QTcpSocket *, QByteArray> m_tcpSockets;
|
||||
};
|
||||
|
||||
} // namespace GuezNasat
|
||||
Reference in new issue
Block a user