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,15 +1,22 @@
/**
* DdsHandler for DDS
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-04-14
*/
#include "dds_handler.h"
#include <Core/pacemaker.h>
#include <DDS/Core/pacemaker.h>
namespace ApHlaJson
{
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
@@ -21,13 +28,13 @@ bool DdsHandler::init(const QStringList &qosFileList)
return false;
}
// default initialize Publisher and Subscriber
m_ddsConnector->initPublisherSubscriber();
// Pacemaker
m_pacemaker = std::make_shared<Core::Pacemaker>(m_ddsConnector);
return true;
}
}
} // namespace PatSimJson
@@ -1,12 +1,17 @@
/**
* Send / Receive telegrams to/from Hla
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-09-26
*/
#pragma once
#include <QtCore/QObject>
#include <QtWebSockets/QWebSocket>
#include <QObject>
#include <QWebSocket>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h> // tr_lts
#include "logger.h"
#include "ppm_handler.h"
#include "aes_handler.h"
@@ -50,10 +55,8 @@ Q_SIGNALS:
void broadcastTelegramsRequest(int equipmentNumber, int broadcastIndex, int resetCounter);
void hlaTelegramReceived(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele);
private:
NGL::INGLLogger &m_logger;
QUrl webSocketUrl() const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
std::shared_ptr<HlaHandlerRx> m_recvFromHla;
std::shared_ptr<HlaHandlerTx> m_sendToHla;
@@ -61,6 +64,8 @@ private:
QWebSocket *m_webSocket;
QTimer *m_webSocketReconnectTimer;
bool m_bWarnedOnce;
NGL::INGLLogger &m_logger;
};
}
} // namespace HlaJson
@@ -1,11 +1,16 @@
/**
* Send / Receive telegrams to/from Hla
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2016-09-26
*/
#pragma once
#include <QtCore/QObject>
#include <QObject>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h> // tr_lts
#include "dds_handler.h"
#include "logger.h"
#include "ppm_handler.h"
@@ -61,7 +66,6 @@ public:
const char *name() const override { return tr_lts("dds", "ApHlaJson"); }
private:
NGL::INGLLogger &m_logger;
HlaDispatcher *m_hlaDispatcher;
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
@@ -73,7 +77,9 @@ private:
std::shared_ptr<PdmHandler> m_pdmHandler;
std::shared_ptr<AesHandler> m_aesHandler;
std::shared_ptr<DdsHandler> m_ddsHandler;
NGL::INGLLogger &m_logger;
int m_domainId;
int m_exerciseId;
};
}
} // namespace HlaJson