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:
torstenandCopilot committed 2026-09-15 18:20:26 +00:00
1 parent f23384bb68
commit 7173785915
18662 files changed
+4115092 -5435

No files matched your search

@@ -0,0 +1,4 @@
add_subdirectory(parent_alpha)
add_subdirectory(child_beta)
add_subdirectory(child_gamma)
@@ -0,0 +1,10 @@
add_library(childBetaGui MODULE child_beta.cpp child_beta.h)
target_link_libraries(childBetaGui PRIVATE Qt5::Widgets)
target_include_directories(childBetaGui PRIVATE ${CMAKE_SOURCE_DIR}/interfaces)
# Plugin in den Laufzeit-Ordner verschieben
set_target_properties(childBetaGui PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
RUNTIME_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
)
@@ -0,0 +1,36 @@
#include "child_beta.h"
#include <QVBoxLayout>
namespace DLBO
{
ChildBeta::ChildBeta()
{
m_widget = new QWidget();
QVBoxLayout *layout = new QVBoxLayout(m_widget);
m_widget->setStyleSheet(QStringLiteral("border: 1px solid green; background-color: #f0fff0; margin: 5px;"));
QLabel *title = new QLabel(QStringLiteral("Kind-Widget 1"));
title->setStyleSheet(QStringLiteral("font-weight: bold; color: green;"));
m_staticLabel = new QLabel(QStringLiteral("Warte auf Init-Daten..."));
m_liveLabel = new QLabel(QStringLiteral("Warte auf Live-Text..."));
layout->addWidget(title);
layout->addWidget(m_staticLabel);
layout->addWidget(m_liveLabel);
}
void ChildBeta::setParentData(const QString &data)
{
if (m_staticLabel)
m_staticLabel->setText(QStringLiteral("Init-Wert: %1").arg(data));
}
void ChildBeta::updateLiveData(const QString &text)
{
if (m_liveLabel)
{
m_liveLabel->setText(text.isEmpty() ? QStringLiteral("Warte auf Live-Text...") : QStringLiteral("Beta Live: ") + text);
}
}
}
@@ -0,0 +1,33 @@
#pragma once
#include "../../interfaces/child_interface.h"
#include <QLabel>
#include <QObject>
namespace DLBO
{
class ChildBeta
: public QObject
, public ChildInterface
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "gui:3:ChildInterface")
Q_INTERFACES(ChildInterface)
public:
ChildBeta();
QString childName() const override { return QStringLiteral("BetaChild"); }
QString targetParentName() const override { return QStringLiteral("AlphaParent"); }
QWidget *widget() override { return m_widget; }
void setParentData(const QString &data) override;
public slots:
void updateLiveData(const QString &text) override;
private:
QWidget *m_widget;
QLabel *m_staticLabel;
QLabel *m_liveLabel;
};
}
@@ -0,0 +1,3 @@
{
"Keys": ["child_beta"]
}
@@ -0,0 +1,10 @@
add_library(childGammaGui MODULE child_gamma.cpp child_gamma.h)
target_link_libraries(childGammaGui PRIVATE Qt5::Widgets)
target_include_directories(childGammaGui PRIVATE ${CMAKE_SOURCE_DIR}/interfaces)
# Plugin in den Laufzeit-Ordner verschieben
set_target_properties(childGammaGui PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
RUNTIME_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
)
@@ -0,0 +1,37 @@
#include "child_gamma.h"
#include <QVBoxLayout>
namespace DLBO
{
ChildGamma::ChildGamma()
{
m_widget = new QWidget();
QVBoxLayout *layout = new QVBoxLayout(m_widget);
m_widget->setStyleSheet(QStringLiteral("border: 1px solid purple; background-color: #faf0ff; margin: 5px;"));
QLabel *title = new QLabel(QStringLiteral("Kind-Widget 2"));
title->setStyleSheet(QStringLiteral("font-weight: bold; color: purple;"));
m_staticLabel = new QLabel(QStringLiteral("Warte auf Init-Daten..."));
m_liveLabel = new QLabel(QStringLiteral("Warte auf Live-Text..."));
layout->addWidget(title);
layout->addWidget(m_staticLabel);
layout->addWidget(m_liveLabel);
}
void ChildGamma::setParentData(const QString &data)
{
if (m_staticLabel)
m_staticLabel->setText(QStringLiteral("Init-Wert: %1").arg(data));
}
void ChildGamma::updateLiveData(const QString &text)
{
if (m_liveLabel)
{
m_liveLabel->setText(text.isEmpty() ? QStringLiteral("Warte auf Live-Text...") : QStringLiteral("Gamma Live: ") + text);
}
}
}
@@ -0,0 +1,33 @@
#pragma once
#include "../../interfaces/child_interface.h"
#include <QLabel>
#include <QObject>
namespace DLBO
{
class ChildGamma
: public QObject
, public ChildInterface
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "gui:3:ChildInterface")
Q_INTERFACES(ChildInterface)
public:
ChildGamma();
QString childName() const override { return QStringLiteral("GammaChild"); }
QString targetParentName() const override { return QStringLiteral("AlphaParent"); }
QWidget *widget() override { return m_widget; }
void setParentData(const QString &data) override;
public slots:
void updateLiveData(const QString &text) override;
private:
QWidget *m_widget;
QLabel *m_staticLabel;
QLabel *m_liveLabel;
};
}
@@ -0,0 +1,3 @@
{
"Keys": ["child_gamma"]
}
@@ -0,0 +1,10 @@
add_library(parentAlphaGui MODULE parent_alpha.cpp parent_alpha.h)
target_link_libraries(parentAlphaGui PRIVATE Qt5::Widgets)
target_include_directories(parentAlphaGui PRIVATE ${CMAKE_SOURCE_DIR}/interfaces)
# Plugin in den Laufzeit-Ordner verschieben
set_target_properties(parentAlphaGui PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
RUNTIME_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
)
@@ -0,0 +1,31 @@
#include "parent_alpha.h"
#include <QLabel>
namespace DLBO
{
ParentAlpha::ParentAlpha()
{
m_widget = new QWidget();
m_layout = new QVBoxLayout(m_widget);
m_widget->setStyleSheet(QStringLiteral("border: 2px solid blue; padding: 10px; margin: 5px;"));
QLabel *label = new QLabel(QStringLiteral("Eltern-Widget (AlphaParent)\nBsp.: Tln-Info-Fenster"));
label->setStyleSheet(QStringLiteral("font-weight: bold; color: blue; font-size: 14px;"));
m_layout->addWidget(label);
m_inputField = new QLineEdit();
m_inputField->setPlaceholderText(QStringLiteral("Live-Eingabe für alle Kinder..."));
m_layout->addWidget(m_inputField);
connect(m_inputField, &QLineEdit::textChanged, this, &ParentAlpha::dataChangedLive);
}
void ParentAlpha::addChildWidget(QWidget *childWidget)
{
if (childWidget)
{
m_layout->addWidget(childWidget);
}
}
}
@@ -0,0 +1,35 @@
#pragma once
#include "../../interfaces/parent_interface.h"
#include <QLineEdit>
#include <QObject>
#include <QVBoxLayout>
namespace DLBO
{
class ParentAlpha
: public QObject
, public ParentInterface
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "gui:3:ParentInterface")
Q_INTERFACES(ParentInterface)
public:
ParentAlpha();
QString pluginName() const override { return QStringLiteral("AlphaParent"); }
QWidget *widget() override { return m_widget; }
void addChildWidget(QWidget *childWidget) override;
QObject *qobjectInstance() override { return this; }
signals:
void dataChangedLive(const QString &text);
private:
QWidget *m_widget;
QVBoxLayout *m_layout;
QLineEdit *m_inputField;
};
}
@@ -0,0 +1,3 @@
{
"Keys": ["parent_alpha"]
}