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,61 @@
/**
* Handler for all exercise objects
* $Id$
* $HeadURL$
* $Author$
* Created by Hanna E. Rathje, SLSE, 2015-09-03
*/
#include "handler_xxx_xxx.h"
#include "object_xxx_xxx.h"
#include "yyy_db.h"
#include "db_handler.h"
#include <QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace YyyYyyYyy
{
HandlerXxx::HandlerXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler)
, m_logger(getLogger("HandlerXxx"))
{}
HandlerXxx::~HandlerXxx()
{}
bool HandlerXxx::init()
{
QVector<Database::YyyXxx> dataVec;
// read all Xxxs from database
if(!m_dbHandler->db()->select(dataVec))
{
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
// create languageHmi objects
for (const Database::YyyXxx &data : qAsConst(dataVec))
{
ObjectXxx *ifs(new ObjectXxx(m_ddsHandler, m_dbHandler, this));
Core::FunctionReplyObject ret = ifs->createObject(data);
if(ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
return false;
}
m_xxxObjMap.insert(ifs->getId(), ifs);
}
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_xxxObjMap.size();
return true;
}
} // Namespace YyyYyyYyy
@@ -0,0 +1,39 @@
/**
* Handler for all Language HMI objects
* $Id$
* $HeadURL$
* $Author$
* Created by Hanna E. Rathje, SLSE, 2015-09-03
*/
#pragma once
#include <QMap>
#include "dds_handler.h"
#include "logger.h"
namespace YyyYyyYyy
{
class DbHandler;
class ObjectXxx;
class HandlerXxx : public QObject
{
public:
HandlerXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent = nullptr);
~HandlerXxx();
bool init();
private:
private:
QMap<int, ObjectXxx*> m_xxxObjMap;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
NGL::INGLLogger &m_logger;
};
}
@@ -0,0 +1,68 @@
/**
* Handler for the HMI language
* $Id$
* $HeadURL$
* $Author$
*/
#include "object_xxx_xxx.h"
#include "dds_handler.h"
#include "db_handler.h"
#include "logger.h"
namespace YyyYyyYyy
{
ObjectXxx::ObjectXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler)
, m_logger(getLogger("ObjectXxx"))
{
}
ObjectXxx::~ObjectXxx()
{
}
Core::FunctionReplyObject ObjectXxx::createObject(const Database::YyyXxx &data)
{
m_data = data;
if(m_data.id <= 0)
return Core::FunctionReplyObject(m_data.id, "It is not intended to insert data this way...");
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectXxx::updateObject(const Database::YyyXxx &data)
{
return Core::FunctionReplyObject(m_data.id, "You are not allowed to change this datum.");
}
Core::FunctionReplyObject ObjectXxx::removeObject()
{
return Core::FunctionReplyObject(m_data.id, "Data removal denied.");
}
void ObjectXxx::onPublishData()
{
YyyYyyYyy::Xxx ddsData;
ddsData.id(m_data.id);
// Todo: Copy as above
INFO_LOG(m_logger) << "Publish YyyXxx-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
{
ERROR_LOG(m_logger) << "Error publishing YyyXxx-data to dds";
}
}
} // Namespace YyyYyyYyy
@@ -0,0 +1,49 @@
/**
* Exercise object
* $Id$
* $HeadURL$
* $Author$
*/
#pragma once
#include <QObject>
#include "dds_handler.h"
#include "logger.h"
#include <DDS/Core/function_reply_object.h>
// Generated
#include <YyyYyyYyy/yyy_db.h>
namespace YyyYyyYyy
{
class DbHandler;
class ObjectXxx : public QObject
{
Q_OBJECT
public:
explicit ObjectXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent = nullptr);
~ObjectXxx();
Core::FunctionReplyObject createObject(const Database::YyyXxx &data);
Core::FunctionReplyObject updateObject(const Database::YyyXxx &data);
Core::FunctionReplyObject removeObject();
int getId() const { return m_data.id; }
protected Q_SLOTS:
void onPublishData();
private:
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
Database::YyyXxx m_data;
NGL::INGLLogger &m_logger;
};
}