Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_enums.hpp.stub

@@ -210,4 +210,34 @@ enum class L46_GpsFrequency : int { L1 = 0, L2 };
 
 enum class L48_TrajectoryRocket : int { Nominal = 0, Vertical };
 
+// Enums required by pdm_db_structs.h
+enum class HgrMineSearchFilterType : int {
+    Unknown = 0,
+    Type1 = 1,
+    Type2 = 2,
+    Type3 = 3,
+    Type4 = 4,
+    Type5 = 5,
+    Type6 = 6,
+    Type7 = 7
+};
+
+enum class GearClass : int {
+    Unknown = 0,
+    Class1 = 1,
+    Class2 = 2,
+    Class3 = 3,
+    Class4 = 4,
+    Class5 = 5
+};
+
+enum class VulnerabilityClass : int {
+    Unknown = 0,
+    ClassA = 1,
+    ClassB = 2,
+    ClassC = 3,
+    ClassD = 4,
+    ClassE = 5
+};
+
 } // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_translation.h.stub

@@ -10,10 +10,12 @@
 
 // filename: pdm_translation.h
 
+#include <QString>
 #include "pdm_enums.hpp"
 #ifndef PDM_COMMON_EXPORT
 #ifdef BUILD_RTI
 #include "svcpdmcommon_export.h"
+#define PDM_COMMON_EXPORT SVCPDMCOMMON_EXPORT
 #else
 #define PDM_COMMON_EXPORT
 #endif
@@ -161,4 +163,29 @@ inline PDM_COMMON_EXPORT QString toString(EventType et)
     }
 }
 
+inline PDM_COMMON_EXPORT QString toString(VulnerabilityState vs)
+{
+    switch (vs) {
+        case VulnerabilityState::NoChange: return QStringLiteral("NoChange");
+        case VulnerabilityState::CombatReady: return QStringLiteral("CombatReady");
+        case VulnerabilityState::LightDamage: return QStringLiteral("LightDamage");
+        case VulnerabilityState::MediumDamage: return QStringLiteral("MediumDamage");
+        case VulnerabilityState::HeavyDamage: return QStringLiteral("HeavyDamage");
+        case VulnerabilityState::MobilityKill: return QStringLiteral("MobilityKill");
+        case VulnerabilityState::VisibleMobilityKill: return QStringLiteral("VisibleMobilityKill");
+        case VulnerabilityState::WeaponSystemDamage: return QStringLiteral("WeaponSystemDamage");
+        case VulnerabilityState::VisibleWeaponSystemDamage: return QStringLiteral("VisibleWeaponSystemDamage");
+        case VulnerabilityState::CatastrophicKill: return QStringLiteral("CatastrophicKill");
+        case VulnerabilityState::TemporarySeverance: return QStringLiteral("TemporarySeverance");
+        case VulnerabilityState::NearMiss: return QStringLiteral("NearMiss");
+        case VulnerabilityState::HitWithNoEffect: return QStringLiteral("HitWithNoEffect");
+        case VulnerabilityState::VulnerabilityBitsChanged: return QStringLiteral("VulnerabilityBitsChanged");
+        case VulnerabilityState::Reserved: return QStringLiteral("Reserved");
+        case VulnerabilityState::NContamination: return QStringLiteral("NContamination");
+        case VulnerabilityState::BContamination: return QStringLiteral("BContamination");
+        case VulnerabilityState::CContamination: return QStringLiteral("CContamination");
+        default: return QStringLiteral("Unknown");
+    }
+}
+
 } // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h

@@ -1,100 +0,0 @@
-#pragma once
-
-// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
-// Für die Migration erstellen wir minimale Typ-Definitionen
-
-#include <QtCore/QString>
-#include "pdm_export.h"
-
-namespace ProjectDataManagement
-{
-
-// STUB: VulnerabilityState Enum
-enum class VulnerabilityState : int
-{
-    eUnknown = 0,
-    eNormal = 1,
-    eWarning = 2,
-    eCritical = 3
-};
-
-// STUB: VulnerabilityClass Enum
-enum class VulnerabilityClass : int
-{
-    eUnknown = 0,
-    eClassA = 1,
-    eClassB = 2,
-    eClassC = 3
-};
-
-// STUB: VulnerabilityState_def - DDS-generierte Wrapper-Struktur
-struct VulnerabilityState_def
-{
-    using type = VulnerabilityState;
-    static constexpr VulnerabilityState eUnknown = VulnerabilityState::eUnknown;
-    static constexpr VulnerabilityState eNormal = VulnerabilityState::eNormal;
-    static constexpr VulnerabilityState eWarning = VulnerabilityState::eWarning;
-    static constexpr VulnerabilityState eCritical = VulnerabilityState::eCritical;
-};
-
-// STUB: VulnerabilityClass_def - DDS-generierte Wrapper-Struktur
-struct VulnerabilityClass_def
-{
-    using type = VulnerabilityClass;
-    static constexpr VulnerabilityClass eUnknown = VulnerabilityClass::eUnknown;
-    static constexpr VulnerabilityClass eClassA = VulnerabilityClass::eClassA;
-    static constexpr VulnerabilityClass eClassB = VulnerabilityClass::eClassB;
-    static constexpr VulnerabilityClass eClassC = VulnerabilityClass::eClassC;
-    
-    // Statische Member für SoldierInjuries und VehicleDamages
-    static constexpr VulnerabilityClass SoldierInjuries = VulnerabilityClass::eClassA;
-    static constexpr VulnerabilityClass VehicleDamages = VulnerabilityClass::eClassB;
-};
-
-// STUB: ChargeType Enum
-enum class ChargeType : int
-{
-    Unknown = 0,
-    Live = 1,
-    Inert = 2,
-    Practice = 3
-};
-
-// STUB: UnitType Enum
-enum class UnitType : int
-{
-    Unknown = 0,
-    Air = 1,
-    Ground = 2,
-    Naval = 3
-};
-
-// STUB: SimulationType Enum
-enum class SimulationType : int
-{
-    Unknown = 0,
-    Live = 1,
-    Constructive = 2,
-    Virtual = 3
-};
-
-// STUB: EventType Enum
-enum class EventType : int
-{
-    Unknown = 0,
-    Alarm = 1,
-    Warning = 2,
-    Info = 3,
-    Status = 4
-};
-
-// STUB: GearClass Enum
-enum class GearClass : int
-{
-    Unknown = 0,
-    ClassA = 1,
-    ClassB = 2,
-    ClassC = 3
-};
-
-} // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/include/ProjectDataManagement/pdm_types.h.stub

@@ -0,0 +1,34 @@
+#pragma once
+
+// STUB-HEADER: Diese Datei enthält nur Typen die NICHT von RTIDDSGEN generiert werden
+// Alle DDS-generierten Typen sind in pdm_enums.hpp und pdm.hpp
+
+#include <QtCore/QString>
+#include "pdm_export.h"
+
+// Include generated DDS types
+#include "pdm_enums.hpp"
+
+namespace ProjectDataManagement
+{
+
+// These types are NOT generated by RTIDDSGEN and must be defined here
+// STUB: UnitType Enum
+enum class UnitType : int
+{
+    Unknown = 0,
+    Air = 1,
+    Ground = 2,
+    Naval = 3
+};
+
+// STUB: SimulationType Enum
+enum class SimulationType : int
+{
+    Unknown = 0,
+    Live = 1,
+    Constructive = 2,
+    Virtual = 3
+};
+
+} // namespace ProjectDataManagement