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

@@ -1,17 +1,24 @@
/**
* DdsHandler for HighLevelArchitecture
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2017-04-07
*/
#include "dds_handler.h"
#include <Core/pacemaker.h>
#include <DDS/Core/pacemaker.h>
#include <DDS/DTS/generic_dts_impl.h>
namespace HighLevelArchitecture
{
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_exerciseHasHlaConnection(false),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_exerciseHasHlaConnection(false)
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
@@ -30,7 +37,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
return false;
}
// default initialize Publisher and Subscriber
m_ddsConnector->initPublisherSubscriber();
m_pacemaker = std::make_shared<Core::Pacemaker>(m_ddsConnector);
@@ -55,4 +62,4 @@ void DdsHandler::onExerciseChanged(const ExerciseManagement::Exercise &ex, DataM
emit exerciseHlaStateChanged(m_exerciseHasHlaConnection);
}
}
} // namespace HighLevelArchitecture
@@ -1,11 +1,16 @@
/**
* DdsHandler for HighLevelArchitecture
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2017-04-07
*/
#pragma once
#include <DDS/DDSConnector/dds_connector.h>
#include <Core/core_dts_types.h>
#include <DDS/Core/core_dts_types.h>
#include <ExerciseManagement/exm_dtc.h>
#include <QtCore/QObject>
#include <QObject>
#include <Common/logger.h>
@@ -32,14 +37,13 @@ public:
Q_SIGNALS:
void exerciseHlaStateChanged(bool bHlaEnabled);
private:
NGL::INGLLogger &m_logger;
void onExerciseChanged(const ExerciseManagement::Exercise &ex, DataModification modType);
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_dtcExm;
bool m_exerciseHasHlaConnection;
NGL::INGLLogger &m_logger;
};
}
} // namespace HighLevelArchitecture
@@ -1,21 +1,28 @@
/**
* MainHandler for HighLevelArchitecture
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2017-04-07
*/
#include "main_handler.h"
#include <Common/logger.h>
#include "ngs_handler.h"
#include "web_socket_handler.h"
#include <Common/settings.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QTimer>
#include <Core/pacemaker.h>
#include <QCoreApplication>
#include <QTimer>
#include <DDS/Core/pacemaker.h>
namespace HighLevelArchitecture
{
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_exerciseId(0)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
{
@@ -26,7 +33,7 @@ MainHandler::~MainHandler()
bool MainHandler::init(int domainId, int exerciseId)
{
m_exerciseId = exerciseId;
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId, exerciseId);
if (!m_ddsHandler->init())
{
@@ -108,4 +115,4 @@ void MainHandler::onExerciseHlaStateChanged(bool bHlaEnabled)
}
}
}
} // namespace HighLevelArchitecture