Removes .IDL warnings: multiple enum definitons and builtin-type collisions

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp

@@ -142,7 +142,7 @@ void ModuleTestLimits::testAirSupports()
   const auto &items = m_aesDtc->explosionClusters();
   for (const auto &item : qAsConst(items))
   {
-    if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
+    if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::GearClass_AirSupport)
       ++counter;
   }
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp

@@ -90,7 +90,7 @@ bool HandlerEffectCluster::init()
     }
 
     // Context NASAT: check via chargeTypeId:
-    const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport;
+    const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport;
     ifs->setAirSupportSource(bChargeIsAirSupport);
     // Charge Effects are alwazs Central!
 
@@ -488,7 +488,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
 
   // Context NASAT: check via chargeTypeId:
 
-  const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::AirSupport;
+  const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport;
   ifs->setAirSupportSource(bChargeIsAirSupport);
   // Now we always need to send fire ready, never without
   newData.effectorState = AesEffectorState::EsNotReadyToFire;
@@ -503,7 +503,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
 
   DEBUG_LOG(m_logger) << "New EffectCluster";
 
-  if (gearClass == ProjectDataManagement::GearClass::AirSupport)
+  if (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
   {
     if (s_currentAirSupportCount >= s_maxAirSupportCount)
     {
@@ -571,7 +571,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
   // Context NASAT: check via chargeTypeId:
   const ProjectDataManagement::GearClass gc = m_mainHandler->gearClassOfChargeTypeId(request.effectors().at(0).chargeStruct().chargeTypeId());
 
-  const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::AirSupport);
+  const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
   ifs->setAirSupportSource(bChargeIsAirSupport);
   // For counting, only Elements being at least prepared are important:
   if (request.effectStart().is_set() && ifs->isObjectModifiable()) // ToDo: check
@@ -636,7 +636,7 @@ void HandlerEffectCluster::recountActiveAreas()
   {
     if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
     {
-      if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
+      if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
         ++s_currentAirSupportCount;
     }
   }
@@ -698,7 +698,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
 
   switch (categorie.underlying())
   {
-    case ProjectDataManagement::L22_FireHaltCategory::A: // Feuer Halt Allgemein
+    case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A: // Feuer Halt Allgemein
     {
       // all control operations are halted
       for (auto *ifs : qAsConst(effectClusterPartyMap))
@@ -714,7 +714,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
       break;
     }
 
-    case ProjectDataManagement::L22_FireHaltCategory::R: // Feuer Halt Referenziert
+    case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R: // Feuer Halt Referenziert
     {
       // Ongoing combat operations are halted after comparing the extent of
       // the fire hold with the corresponding target coordinate and circular area.
@@ -740,7 +740,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
       }
       break;
     }
-    case ProjectDataManagement::L22_FireHaltCategory::E: // Feuer Einstellen
+    case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E: // Feuer Einstellen
     {
       // Cease Fire (Category E) messages are issued when continuing an engagement is no longer viable.
       // Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
@@ -754,7 +754,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
       }
       break;
     }
-    case ProjectDataManagement::L22_FireHaltCategory::C: // Aufheben Feuer Halt Allgemein
+    case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C: // Aufheben Feuer Halt Allgemein
       for (auto *ifs : qAsConst(effectClusterPartyMap))
       {
         DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
@@ -766,7 +766,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
         ifs->resumePause(req);
       }
       break;
-    case ProjectDataManagement::L22_FireHaltCategory::F: // Aufheben Feuer Halt Referenziert
+    case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F: // Aufheben Feuer Halt Referenziert
     {
       for (auto *ifs : qAsConst(effectClusterPartyMap))
       {

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_explosion_cluster.cpp

@@ -52,7 +52,7 @@ bool HandlerExplosionCluster::init()
     }
 
     // Context NASAT: check via chargeTypeId:
-    const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport;
+    const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport;
     ifs->setAirSupportSource(bChargeIsAirSupport);
 
     if(!ifs->data().isCentral)
@@ -369,7 +369,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
 
   // Context NASAT: check via chargeTypeId:
   const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.chargeStruct().chargeTypeId());
-  const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::AirSupport;
+  const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::GearClass_AirSupport;
   ifs->setAirSupportSource(bChargeIsAirSupport);
 
   const Core::FunctionReplyObject ret = ifs->createObject(newData);
@@ -385,7 +385,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
   if (ifs->data().isCentral)
   {
     DEBUG_LOG(m_logger) << "New cen ExplosionCluster";
-    if(gearClass == ProjectDataManagement::GearClass::AirSupport)
+    if(gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
     {
       if (s_currentAirSupportCount >= s_maxAirSupportCount)
       {
@@ -471,7 +471,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
 
   // Context NASAT: check via chargeTypeId:
   const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.chargeStruct().chargeTypeId());
-  const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::AirSupport);
+  const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
   ifs->setAirSupportSource(bChargeIsAirSupport);
 
   // For counting, only Elements being at least prepared are important:
@@ -615,7 +615,7 @@ void HandlerExplosionCluster::recountActiveAreas()
   {
     if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
     {
-      if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
+      if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
         ++s_currentAirSupportCount;
     }
   }

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h

@@ -360,7 +360,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
     if (static_cast<MineClass::type>(m_mainHandler->dds()->pdmDtc()->mineClass(m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId)) == MineClass::VirtualSingle)
       return true;
 
-    if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
+    if (m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
       return true;
 
     // Laser-Guidable Weapons must always be calculated by CES

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp

@@ -2769,13 +2769,13 @@ void ObjectEffectCluster::sendCalculateTrajectoryAdlerRequest(const QVector<Data
     const ProjectDataManagement::GearClass &gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(m_data.chargeTypeId);
     switch (gc.underlying())
     {
-      case ProjectDataManagement::GearClass::Artillery:
+      case ProjectDataManagement::GearClass::GearClass_Artillery:
         request.weaponSystemType(TrainingAreaBase::WeaponSystemType::PZH);
         break;
-      case ProjectDataManagement::GearClass::Mortar:
+      case ProjectDataManagement::GearClass::GearClass_Mortar:
         request.weaponSystemType(TrainingAreaBase::WeaponSystemType::MRS);
         break;
-      case ProjectDataManagement::GearClass::Rocket:
+      case ProjectDataManagement::GearClass::GearClass_Rocket:
         request.weaponSystemType(TrainingAreaBase::WeaponSystemType::MARS);
         break;
       default: