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,79 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* The MessageModel class handles message related data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, SLSE, 2017-09-06
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QDateTime>
|
||||
|
||||
class QWebSocket;
|
||||
|
||||
struct MessageInfo
|
||||
{
|
||||
QDateTime time;
|
||||
int32_t idVal;
|
||||
QString direction;
|
||||
QString type;
|
||||
QString uuid;
|
||||
QString data;
|
||||
|
||||
MessageInfo(int32_t id, const QString &direction, const QString &type, const QString &uuid, const QString &data)
|
||||
: time(QDateTime::currentDateTime())
|
||||
, idVal(id)
|
||||
, direction(direction)
|
||||
, type(type)
|
||||
, uuid(uuid)
|
||||
, data(data)
|
||||
{}
|
||||
|
||||
MessageInfo()
|
||||
: time(QDateTime::currentDateTime())
|
||||
, idVal(-1)
|
||||
, direction(QLatin1String("-"))
|
||||
, type(QLatin1String("-"))
|
||||
, uuid(QLatin1String("-"))
|
||||
, data(QLatin1String("-"))
|
||||
{}
|
||||
|
||||
int32_t id() const { return idVal; }
|
||||
};
|
||||
|
||||
class MessageModel
|
||||
: public LtsWidgets::LtsAbstractTableModel<MessageInfo>
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
enum MessageDirection
|
||||
{
|
||||
TO_PROXY,
|
||||
FROM_PROXY
|
||||
};
|
||||
|
||||
enum Column
|
||||
{
|
||||
TIME,
|
||||
DIRECTION,
|
||||
TYPE,
|
||||
UUID,
|
||||
DATA
|
||||
};
|
||||
|
||||
MessageModel(QObject *parent = nullptr);
|
||||
|
||||
void addMessage(MessageDirection direction, const QString &message);
|
||||
void addMessage(MessageDirection direction, const QString &type, const QString &uuid, const QString &data);
|
||||
|
||||
QVariant data(const QModelIndex &index, int role) const override final;
|
||||
|
||||
private: // methods
|
||||
QString toString(MessageDirection direction) const;
|
||||
|
||||
public:
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user