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/Lts/Services/ProjectDataManagement/pdm_to_string.cpp

@@ -18,52 +18,52 @@ namespace ProjectDataManagement
 //
 static QString toStringBuilding(VulnerabilityState vs)
 {
-  switch (vs.underlying())
+  switch (vs)
   {
 #ifdef ETS_MODE
-  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
+  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
 #else
-  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
+  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
 #endif
   default: break;
   }
-  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
+  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
 }
 
 static QString toStringVehicle(VulnerabilityState vs)
 {
-  switch (vs.underlying())
+  switch (vs)
   {
 #ifdef ETS_MODE
-  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::CombatReady:
-  case VulnerabilityState_def::NoChange:
-  case VulnerabilityState_def::TemporarySeverance:
-  case VulnerabilityState_def::NearMiss:
-  case VulnerabilityState_def::HitWithNoEffect:
-  case VulnerabilityState_def::VulnerabilityBitsChanged:
-  case VulnerabilityState_def::NContamination:
-  case VulnerabilityState_def::BContamination:
-  case VulnerabilityState_def::CContamination:
-  case VulnerabilityState_def::NotReady:  // Internal
-  case VulnerabilityState_def::Reserved:  // Internal
+  case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CombatReady:
+  case VulnerabilityState::NoChange:
+  case VulnerabilityState::TemporarySeverance:
+  case VulnerabilityState::NearMiss:
+  case VulnerabilityState::HitWithNoEffect:
+  case VulnerabilityState::VulnerabilityBitsChanged:
+  case VulnerabilityState::NContamination:
+  case VulnerabilityState::BContamination:
+  case VulnerabilityState::CContamination:
+  case VulnerabilityState::NotReady:  // Internal
+  case VulnerabilityState::Reserved:  // Internal
     break;  // use common translation from toString()
 #endif
   }
@@ -73,38 +73,38 @@ static QString toStringVehicle(VulnerabilityState vs)
 
 static QString toStringSoldier(VulnerabilityState vs)
 {
-  switch (vs.underlying())
+  switch (vs)
   {
 #ifdef ETS_MODE
-  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
-  case VulnerabilityState_def::CombatReady:
-  case VulnerabilityState_def::TemporarySeverance:
-  case VulnerabilityState_def::NearMiss:
-  case VulnerabilityState_def::HitWithNoEffect:
-  case VulnerabilityState_def::VulnerabilityBitsChanged:
-  case VulnerabilityState_def::NContamination:
-  case VulnerabilityState_def::BContamination:
-  case VulnerabilityState_def::CContamination:
-  case VulnerabilityState_def::NoChange:
+  case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
+  case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
+  case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
+  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
+  case VulnerabilityState::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState::CombatReady:
+  case VulnerabilityState::TemporarySeverance:
+  case VulnerabilityState::NearMiss:
+  case VulnerabilityState::HitWithNoEffect:
+  case VulnerabilityState::VulnerabilityBitsChanged:
+  case VulnerabilityState::NContamination:
+  case VulnerabilityState::BContamination:
+  case VulnerabilityState::CContamination:
+  case VulnerabilityState::NoChange:
     break;  // use common translation from toString()
   // those should not happen ...
-  case VulnerabilityState_def::MobilityKill:
-  case VulnerabilityState_def::VisibleMobilityKill:
-  case VulnerabilityState_def::NotReady:  // Internal
-  case VulnerabilityState_def::Reserved:  // Internal
+  case VulnerabilityState::MobilityKill:
+  case VulnerabilityState::VisibleMobilityKill:
+  case VulnerabilityState::NotReady:  // Internal
+  case VulnerabilityState::Reserved:  // Internal
     break;
 #endif
   }
@@ -113,20 +113,20 @@ static QString toStringSoldier(VulnerabilityState vs)
 
 QString toString(VulnerabilityState vs, VulnerabilityClass vc)
 {
-  switch (vc.underlying())
+  switch (vc)
   {
-  case VulnerabilityClass_def::Unknown:
-  case VulnerabilityClass_def::WtdDamages:
-  case VulnerabilityClass_def::WtdInjuries:
+  case VulnerabilityClass::Unknown:
+  case VulnerabilityClass::WtdDamages:
+  case VulnerabilityClass::WtdInjuries:
     return toString(vs);
-  case VulnerabilityClass_def::BuildingDamages:
+  case VulnerabilityClass::BuildingDamages:
     return toStringBuilding(vs);
-  case VulnerabilityClass_def::VehicleDamages:
+  case VulnerabilityClass::VehicleDamages:
     return toStringVehicle(vs);
-  case VulnerabilityClass_def::SoldierInjuries:
+  case VulnerabilityClass::SoldierInjuries:
     return toStringSoldier(vs);
   }
-  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
+  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
 }
 
 } // namespace ProjectDataManagement