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,23 +1,30 @@
/**
* MainHandler for HighLevelArchitecture
* $Id$
* $HeadURL$
* $Author$
* Created by Christian Ehrlicher, SLSE, 2017-04-07
*/
#include "main_handler.h"
#include "ngs_handler.h"
#include "web_socket_interface.h"
#include "Common/identifierstruct.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QTimer>
#include <QCoreApplication>
#include <QTimer>
#include <Common/settings.h>
#include <Common/logger.h>
#include <Core/pacemaker.h>
#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()
{
@@ -27,29 +34,42 @@ MainHandler::~MainHandler()
bool MainHandler::init(int exerciseId)
{
NOTICE_LOG(m_logger) << Q_FUNC_INFO << ", exerciseId=" << exerciseId;
NOTICE_LOG(m_logger) << LOGFUNCTION << ", exerciseId=" << exerciseId;
m_exerciseId = 5;
m_exerciseId = 5; // exerciseId;
IdentifierStruct::setOwnSiteId(exerciseId);
//
// NgsHandler
//
/*
if (!m_ngsHandler)
{
m_ngsHandler = std::make_shared<NgsHandler>();
// connect(m_ngsHandler.get(), &NgsHandler::ngsHandlerReady,
// m_wsHandler.get(), &WebSocketHandler::sendHlaConnectionState, Qt::UniqueConnection);
if (!m_ngsHandler->init())
{
m_ngsHandler = nullptr;
ERROR_LOG(m_logger) << "Could not init ngs - stopping application";
QCoreApplication::quit();
return false;
}
}
*/
//
// WsInterface
//
if (!m_wsInterface)
{
// requests from ws will be sent to ngsHandler:
m_wsInterface = std::make_shared<WsInterface>(m_ngsHandler, this);
int port = 23456;
if (!m_wsInterface->init(port))
{
ERROR_LOG(m_logger) << Q_FUNC_INFO
ERROR_LOG(m_logger) << LOGFUNCTION
<< " WsInterface::init failed on port: " << port;
return false;
}
@@ -64,4 +84,4 @@ bool MainHandler::isConnectedToHla() const
}
}
} // namespace HighLevelArchitecture