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,5 +1,10 @@
/**
* Initialization for GuezNasat
* $Id$
* $HeadURL$
* $Author$
* Created by hjl, SLSE, 2016-11-14
*/
#include "initialization.h"
#include "settings.h"
@@ -14,9 +19,9 @@
#include <GuezNasat/gna_db.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <Core/pacemaker.h>
#include <DDS/Core/pacemaker.h>
#include <QtCore/QTimer>
#include <QTimer>
namespace GuezNasat
{
@@ -24,8 +29,8 @@ namespace GuezNasat
Initialization::Initialization()
: m_logger(getLogger("Initialization"))
{
}
} // end of ctor()
//-----------------------------------------------------------------------------
Initialization::~Initialization()
{
@@ -37,15 +42,15 @@ Initialization::~Initialization()
m_handlerParticipant = nullptr;
m_ddsHandler = nullptr;
m_dbHandler = nullptr;
}
} // end of dtor()
//-----------------------------------------------------------------------------
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
const QSqlDatabase &)
{
INFO_LOG(m_logger) << "Start GuezNasat Initialization.";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
if (!m_ddsHandler->init())
{
@@ -53,31 +58,31 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
return false;
}
// initialize database, we need an own DB connection
m_dbHandler = std::make_shared<DbHandler>();
if (!m_dbHandler->init(ddsConnector->getPartitionId(), Settings::settings()))
// if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
{
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
return false;
}
// create HandlerNasatAircraft
m_handlerNasatAircraft.reset(new HandlerNasatAircraft(this));
// create HandlerNasatAircraftParticipant
m_handlerNasatAircraftParticipant.reset(new HandlerNasatAircraftParticipant(this));
// create HandlerNasatNineLiner
m_handlerNasatNineLiner.reset(new HandlerNasatNineLiner(this));
// create HandlerNasatAircraftParticipant
m_handlerNasatImpact.reset(new HandlerNasatImpact(this));
// create ParticipantPositionPublisher
m_handlerParticipant.reset(new HandlerParticipant(this));
// Connection to NASAT
if (Settings::useWebSocket())
{
INFO_LOG(m_logger) << "Using WebSocket";
@@ -92,12 +97,12 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
INFO_LOG(m_logger) << "GuezNasat Initialization initialized";
return true;
}
} // end of init()
//-----------------------------------------------------------------------------
bool Initialization::loadFromDatabase()
{
TRACE_LOG(m_logger) << Q_FUNC_INFO << "START";
TRACE_LOG(m_logger) << LOGFUNCTION << "START";
if (!m_ddsHandler ||
!m_dbHandler ||
@@ -135,12 +140,12 @@ bool Initialization::loadFromDatabase()
return false;
}
// related to NLDEVCTRL-844: NASAT: Weiterleitung der Luftunterstützung sporadisch ausser Funktion
// Waiting for all (relevant) exercises (AES) to be started, sounds better
// But it´s complicated (some ServiceManagement topics would have to be considered)
// 'AES process is started' is not enough, but when is the FTS available???
// So accept a bailing out (in case of (re-)starting GNA while NASAT is sending data)
// and keep it simple:
#define START_DELAYED
#ifdef START_DELAYED
QTimer::singleShot(31000, m_jsonSocketHandler.get(), [this]() {
@@ -156,7 +161,7 @@ bool Initialization::loadFromDatabase()
ERROR_LOG(m_logger) << "Initialisation WebSocketHandler failed.";
return false;
}
#endif
#endif // START_DELAYED
QObject::connect(m_jsonSocketHandler.get(), &AbstractSocketHandler::simulationStatusReceived,
m_handlerNasatAircraft.get(), &HandlerNasatAircraft::simulationStatusChanged);
@@ -171,7 +176,7 @@ bool Initialization::loadFromDatabase()
QObject::connect(m_jsonSocketHandler.get(), &AbstractSocketHandler::nineLinerReceived,
m_handlerNasatNineLiner.get(), &HandlerNasatNineLiner::nineLinerReceived);
TRACE_LOG(m_logger) << Q_FUNC_INFO << "END";
TRACE_LOG(m_logger) << LOGFUNCTION << "END";
return true;
}
@@ -180,4 +185,4 @@ std::shared_ptr<DatabaseInterface> Initialization::db() const
return m_dbHandler->db();
}
}
} // namespace GuezNasat