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,159 +1,106 @@
#pragma once
// STUB - RTI DDS not available
// This stub provides minimal functionality for building without RTI Connext DDS
#include <LtsSession/ltssession_export.h>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <LtsWidgets/lts_dialog.h>
#include <DDS/Core/core_ftc.h>
#include <QPointer>
#include <memory>
// Forward declaration - actual type from LtsWidgets
namespace LtsWidgets {
struct TopicInfo {
// Minimal stub for TopicInfo
QString topicName;
int entityId{0};
};
}
#include <NGLLogger/NGLLoggerBootstrap.h>
/*
Anmerkungen:
slotTryLock
-> slotTryLock
-> tryLockEntityRequest
<- onTryLockEntityReply
emit signalLockDialog | emit signalUnlockDialog
PpmGuiPlugin:
- ParticipantOrganisationDialog (asSupportService==false)
a) avoid disabling by overloading ::lock() -> yes
b) use tryLockTopicNew -> yes
- ParticipantEdit (asSupportService==false||true)
a) avoid disabling by overloading ::lock() -> yes
b) use tryLockTopicNew -> yes
3 TacticalOrganisation
-> left and right <-
onReinitLeft, onReinitRight
*/
namespace LtsSession
{
// STUB: TopicLockHandler - minimal implementation without RTI DDS
class LTSSESSION_EXPORT TopicLockHandler : public QObject
{
Q_OBJECT
public:
TopicLockHandler() = default;
~TopicLockHandler() = default;
Q_OBJECT
public:
TopicLockHandler();
~TopicLockHandler();
bool init(void* coreFtc, int exerciseId)
{
Q_UNUSED(coreFtc);
Q_UNUSED(exerciseId);
return false; // RTI not available
}
bool init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId);
bool isLocked() const
{
return m_locked;
}
bool isLocked() const { return m_locked; }
LtsWidgets::TopicInfo getTopicInfo() const { return m_topicInfo; }
LtsWidgets::TopicInfo getTopicInfo() const
{
return m_topicInfo;
}
public slots:
void slotTryLock(const LtsWidgets::TopicInfo &topicInfo);
bool slotUnlock();
void slotFinalize(); // unlock, finally delete
public slots:
void slotTryLock(const LtsWidgets::TopicInfo& topicInfo)
{
Q_UNUSED(topicInfo);
// STUB: no-op
}
bool slotUnlock()
{
return false; // STUB: cannot unlock without RTI
}
void slotFinalize()
{
// STUB: no-op
}
signals:
void signalLockDialog(const QString &lockedBy);
void signalUnlockDialog();
signals:
void signalLockDialog(const QString& lockedBy);
void signalUnlockDialog();
private:
bool lock();
bool unlock();
std::string objStateAsString() const;
private:
bool lock()
{
return false; // STUB
}
bool unlock()
{
return false; // STUB
}
std::string objStateAsString() const
{
return "STUB";
}
std::shared_ptr<Core::Interface::Ftc> m_coreFtc;
void* m_coreFtc{nullptr}; // STUB: was std::shared_ptr<Core::Interface::Ftc>
LtsWidgets::TopicInfo m_topicInfo;
int m_lockEntityId{0};
int m_exerciseId{0};
bool m_locked{false};
bool m_askedForLock{false};
bool m_deleteAfterAnswer{false};
LtsWidgets::TopicInfo m_topicInfo;
int m_lockEntityId{0}; // reply.id(); / set by reply of ddsCall
int m_exerciseId{0};
bool m_locked{false};
bool m_askedForLock{false}; // reply does not tell..
bool m_deleteAfterAnswer{false};
NGL::INGLLogger &m_logger;
};
// STUB: TopicLockHanderData - minimal implementation without RTI DDS
class LTSSESSION_EXPORT TopicLockHanderData : public QObject
{
Q_OBJECT
Q_OBJECT
public:
TopicLockHanderData() = default;
~TopicLockHanderData() = default;
void init(void* coreFtc, int exerciseId)
{
Q_UNUSED(coreFtc);
Q_UNUSED(exerciseId);
}
public:
TopicLockHanderData();
~TopicLockHanderData();
void init(const std::shared_ptr<Core::Interface::Ftc> &coreFtc, int exerciseId);
void unlock()
{
// STUB: no-op
}
void slotTryLock(const LtsWidgets::TopicInfo& topicInfo)
{
Q_UNUSED(topicInfo);
// STUB: no-op
}
bool isLocked() const
{
return false; // STUB
}
LtsWidgets::TopicInfo getTopicInfo() const
{
return LtsWidgets::TopicInfo{}; // STUB
}
void unlock();
void slotTryLock(const LtsWidgets::TopicInfo &topicInfo);
bool isLocked() const;
LtsWidgets::TopicInfo getTopicInfo() const;
const QString &getLockedBy() const { return m_lockedBy; }
const QString& getLockedBy() const
{
return m_lockedBy;
}
Q_SIGNALS:
void lockDataChanged();
Q_SIGNALS:
void lockDataChanged();
public:
QString m_debugName;
private Q_SLOTS:
void slotLock(const QString& lockedBy)
{
Q_UNUSED(lockedBy);
// STUB: no-op
}
void slotUnlock()
{
// STUB: no-op
}
private:
// STUB: No actual TopicLockHandler without RTI
QObject* m_topicLockHandler{nullptr}; // Was QPointer<TopicLockHandler>
QString m_lockedBy;
private Q_SLOTS:
void slotLock(const QString &lockedBy);
void slotUnlock();
public:
QString m_debugName;
private:
QPointer<TopicLockHandler> m_topicLockHandler;
QString m_lockedBy;
};
} // namespace LtsSession