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,87 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* LTS web socket server - Abstract Reply Message and Reply Handler
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Philipp Dassow, SLST, 2017-11-28
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <LtsWebSocket/ltswebsocketcommon_export.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief Base class for reply messages
|
||||
*/
|
||||
class LTSWEBSOCKETCOMMON_EXPORT ReplyMessage
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @brief ~ReplyMessage Destructor
|
||||
*/
|
||||
virtual ~ReplyMessage() = default;
|
||||
|
||||
/**
|
||||
* @brief toJsonString Converts this message into a valid JSON string
|
||||
* @return QString JSON representation of this class
|
||||
*/
|
||||
virtual QString toJsonString() const;
|
||||
|
||||
QJsonObject json() const { return m_jsonRepresentation; }
|
||||
|
||||
protected: // methods
|
||||
ReplyMessage() = default;
|
||||
ReplyMessage(const QString &type, const int typeId, const QString &uuid);
|
||||
|
||||
protected: // attributes
|
||||
QJsonObject m_jsonRepresentation;
|
||||
}; // class ReplyMessage
|
||||
|
||||
/**
|
||||
* @brief The ReplyHandler Interface offers an extremely lightweight API for a class to just write textmessages to
|
||||
*/
|
||||
class LTSWEBSOCKETCOMMON_EXPORT ReplyHandler
|
||||
{
|
||||
public:
|
||||
virtual ~ReplyHandler() = default;
|
||||
/**
|
||||
* @brief addReply Method to write a textmessage via this MessageTransmitter
|
||||
* @param message Message to send
|
||||
*/
|
||||
virtual void addReply(ReplyMessage *message) = 0;
|
||||
}; // class ReplyHandler
|
||||
|
||||
// #################### basic error messages ####################
|
||||
|
||||
/**
|
||||
* @brief The ErrorMessage class is sent when any data from a client could not be processed
|
||||
*/
|
||||
class LTSWEBSOCKETCOMMON_EXPORT ErrorMessage final
|
||||
: public ReplyMessage
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @brief The ErrorData struct represents the data part of an ErrorMessage object
|
||||
*/
|
||||
struct ErrorData
|
||||
{
|
||||
int errorClass = 0;
|
||||
QString uuid;
|
||||
QString errorMessage;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief ErrorMessage Constructor
|
||||
* @param data Data part of an ErrorMessage object
|
||||
*/
|
||||
explicit ErrorMessage(const ErrorData &data);
|
||||
}; // class ErrorMessage
|
||||
|
||||
} // namespace LtsWebSocket
|
||||
Reference in new issue
Block a user