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

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp

@@ -781,8 +781,8 @@ GearClass DtcImplCustom::gearClassFromChargeTypeId(int chargeTypeId)
   if (chargeTypeId <= 0)
   {
     // update cache:
-    s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::Unknown;
-    return ProjectDataManagement::GearClass::Unknown;
+    s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::GearClass_Unknown;
+    return ProjectDataManagement::GearClass::GearClass_Unknown;
   }
 
   const auto &gear2ChargeMap = gearTypeChargeTypes();
@@ -802,9 +802,9 @@ GearClass DtcImplCustom::gearClassFromChargeTypeId(int chargeTypeId)
   }
 
   // update cache:
-  s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::Unknown;
+  s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::GearClass_Unknown;
 
-  return ProjectDataManagement::GearClass::Unknown;
+  return ProjectDataManagement::GearClass::GearClass_Unknown;
 }
 
 QVector<SanitationProcedure> DtcImplCustom::getSanitationProcedures(qint64 procedures)
@@ -991,7 +991,7 @@ bool DtcImplCustom::isRocket(int chargeTypeId)
 {
   const GearClass gearClass = gearClassFromChargeTypeId(chargeTypeId);
 
-  return gearClass.underlying() == GearClass::Rocket;
+  return gearClass.underlying() == GearClass::GearClass_Rocket;
 }
 
 ChargeTypeIgniterTypeIgniterFunction DtcImplCustom::getChargeTypeIgniterTypeIgniterFunction(int chargeTypeId, int igniterTypeId, int igniterFunctionId)

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml

@@ -552,7 +552,7 @@
 <column name="difcuePyro" idlType="boolean"/>
 </topicType>
 <topicType name="CanComponentString" isDataObject="1" autosubscribe="1" routeToClient="1" routeToServer="0" routeInReplay="0" baseValueType="PdmBaseName">
-<column name="bitMask" idlType="long long"/>
+<column name="pdm_bitMask" idlType="long long"/>
 <column name="canDeviceId" idlType="long"/>
 <column name="subDeviceId" idlType="long"/>
 </topicType>
@@ -671,7 +671,7 @@
 </topicType>
 <topicType name="SanitationProcedure" isDataObject="1" autosubscribe="1" routeToClient="1" routeToServer="1" routeInReplay="1" baseValueType="PdmBaseName">
 <column name="type" idlType="string"/>
-<column name="typeId" idlType="long"/>
+<column name="pdm_typeId" idlType="long"/>
 <column name="minimumQualification" idlType="long"/>
 <column name="longName" idlType="string" isTranslatable="1"/>
 <column name="dataCode" idlType="long long"/>
@@ -1111,24 +1111,24 @@
 </customDtcFunctions>
 <enumerations>  
   <enumeration name="L19_Oi">
-    <attribute key="Empty" value="1"/>
-    <attribute key="F1" value="2"/>
-    <attribute key="F2" value="3"/>
-    <attribute key="F3" value="4"/>
-    <attribute key="F4" value="5"/>
-    <attribute key="F5" value="6"/>
-    <attribute key="F6" value="7"/>
-    <attribute key="F7" value="8"/>
-    <attribute key="F8" value="9"/>
-    <attribute key="F9" value="10"/>
-    <attribute key="L" value="11"/>
+    <attribute key="L19_Oi_Empty" value="1"/>
+    <attribute key="L19_Oi_F1" value="2"/>
+    <attribute key="L19_Oi_F2" value="3"/>
+    <attribute key="L19_Oi_F3" value="4"/>
+    <attribute key="L19_Oi_F4" value="5"/>
+    <attribute key="L19_Oi_F5" value="6"/>
+    <attribute key="L19_Oi_F6" value="7"/>
+    <attribute key="L19_Oi_F7" value="8"/>
+    <attribute key="L19_Oi_F8" value="9"/>
+    <attribute key="L19_Oi_F9" value="10"/>
+    <attribute key="L19_Oi_L" value="11"/>
   </enumeration>
   <enumeration name="L22_FireHaltCategory">
-    <attribute key="A" value="1"/>
-    <attribute key="R" value="2"/>
-    <attribute key="E" value="3"/>
-    <attribute key="C" value="4"/>
-    <attribute key="F" value="5"/>
+    <attribute key="L22_FireHaltCategory_A" value="1"/>
+    <attribute key="L22_FireHaltCategory_R" value="2"/>
+    <attribute key="L22_FireHaltCategory_E" value="3"/>
+    <attribute key="L22_FireHaltCategory_C" value="4"/>
+    <attribute key="L22_FireHaltCategory_F" value="5"/>
   </enumeration>
   <enumeration name="L25_KindGuidingLine">
     <attribute key="FFA" value="1"/>
@@ -1300,28 +1300,28 @@
       <attribute key="Vertical" value="2"/>
   </enumeration>
 <enumeration name="DataErrorReason" table="pdm_data_error_reason">
-<attribute key="Unknown" value="0"/>
-<attribute key="WrongParameter" value="1"/>
-<attribute key="TelegramOutdated" value="2"/>
-<attribute key="InvalidByteCount" value="3"/>
-<attribute key="InvalidData" value="4"/>
-<attribute key="FragmentationError" value="5"/>
-<attribute key="UnknownError" value="6"/>
-<attribute key="AdditionalDemandTimeout" value="7"/>
-<attribute key="ErrorLoginEquipmentNumber" value="50"/>
-<attribute key="ErrorLoginTetraId" value="51"/>
-<attribute key="InfoLoginMasteringFlag" value="52"/>
-<attribute key="ErrorSendingNamelist" value="53"/>
-<attribute key="ErrorSendingToExerciseControl" value="54"/>
-<attribute key="ErrorNotLoggedIn" value="55"/>
-<attribute key="ErrorNotLicensed" value="56"/>
-<attribute key="ErrorConfigSelfTest" value="57"/>
-<attribute key="JsonDecodeFailure" value="101"/>
-<attribute key="WrongCrc" value="105"/>
-<attribute key="BroadcastCounterOverflow" value="106"/>
-<attribute key="InvalidTime" value="256"/>
-<attribute key="InvalidPosition" value="257"/>
-<attribute key="InvalidTacticalState" value="258"/>
+<attribute key="DataErrorReason_Unknown" value="0"/>
+<attribute key="DataErrorReason_WrongParameter" value="1"/>
+<attribute key="DataErrorReason_TelegramOutdated" value="2"/>
+<attribute key="DataErrorReason_InvalidByteCount" value="3"/>
+<attribute key="DataErrorReason_InvalidData" value="4"/>
+<attribute key="DataErrorReason_FragmentationError" value="5"/>
+<attribute key="DataErrorReason_UnknownError" value="6"/>
+<attribute key="DataErrorReason_AdditionalDemandTimeout" value="7"/>
+<attribute key="DataErrorReason_ErrorLoginEquipmentNumber" value="50"/>
+<attribute key="DataErrorReason_ErrorLoginTetraId" value="51"/>
+<attribute key="DataErrorReason_InfoLoginMasteringFlag" value="52"/>
+<attribute key="DataErrorReason_ErrorSendingNamelist" value="53"/>
+<attribute key="DataErrorReason_ErrorSendingToExerciseControl" value="54"/>
+<attribute key="DataErrorReason_ErrorNotLoggedIn" value="55"/>
+<attribute key="DataErrorReason_ErrorNotLicensed" value="56"/>
+<attribute key="DataErrorReason_ErrorConfigSelfTest" value="57"/>
+<attribute key="DataErrorReason_JsonDecodeFailure" value="101"/>
+<attribute key="DataErrorReason_WrongCrc" value="105"/>
+<attribute key="DataErrorReason_BroadcastCounterOverflow" value="106"/>
+<attribute key="DataErrorReason_InvalidTime" value="256"/>
+<attribute key="DataErrorReason_InvalidPosition" value="257"/>
+<attribute key="DataErrorReason_InvalidTacticalState" value="258"/>
 </enumeration>
 <enumeration name="EffectSource" table="pdm_effect_source">
 <attribute key="ES_Unknown" value="-1"/>
@@ -1330,180 +1330,180 @@
 <attribute key="ES_HLA" value="2"/>
 <attribute key="ES_ADLER_STANDALONE" value="3"/>
 </enumeration>
-<enumeration name="EventType" table="pdm_event_type">
-<attribute key="Unknown" value="0"/>
-<attribute key="Hit" value="1"/>
-<attribute key="WeaponAssignment" value="2"/>
-<attribute key="BiteMessage" value="3"/>
-<attribute key="FireEvent" value="4"/>
-<attribute key="HitBuilding" value="5"/>
-<attribute key="Manipulation" value="6"/>
-<attribute key="CameraVideo" value="8"/>
-<attribute key="RadioCnr" value="9"/>
-<attribute key="RadioTvc" value="10"/>
-<attribute key="HitEffectSimulation" value="13"/>
-<attribute key="HitMine" value="14"/>
-<attribute key="HitN" value="15"/>
-<attribute key="HitC" value="16"/>
-<attribute key="EnterDangerArea" value="17"/>
-<attribute key="LeaveDangerArea" value="18"/>
-<attribute key="EnterMineArea" value="19"/>
-<attribute key="LeaveMineArea" value="20"/>
-<attribute key="CrossLocalBorderline" value="21"/>
-<attribute key="EnterFunctionalArea" value="22"/>
-<attribute key="LeaveFunctionalArea" value="23"/>
-<attribute key="EnterNuclear" value="24"/>
-<attribute key="LeaveNuclear" value="25"/>
-<attribute key="CrossGlobalBorderline" value="26"/>
-<attribute key="HitB" value="27"/>
-<attribute key="FriendlyFire" value="28"/>
-<attribute key="HitGasPipe" value="29"/>
-<attribute key="MineArea" value="30"/>
-<attribute key="NContamination" value="31"/>
-<attribute key="BCContamination" value="32"/>
-<attribute key="DangerArea" value="33"/>
-<attribute key="FunctionalArea" value="34"/>
-<attribute key="MineCorridor" value="35"/>
-<attribute key="Borderline" value="36"/>
-<attribute key="TechnicalArea" value="37"/>
-<attribute key="GasPipe" value="38"/>
-<attribute key="Sanitation" value="39"/>
-<attribute key="EnterHazardDistance" value="42"/>
-<attribute key="LeaveHazardDistance" value="43"/>
-<attribute key="EquipmentErrorReport" value="100"/>
-<attribute key="EmergencyCall" value="112"/>
-<attribute key="AirSupport" value="44"/>
-<attribute key="ExplosionCluster" value="45"/>
-<attribute key="Jamming" value="46"/>
+<enumeration name="PdmEventType" table="pdm_event_type">
+<attribute key="EventType_Unknown" value="0"/>
+<attribute key="EventType_Hit" value="1"/>
+<attribute key="EventType_WeaponAssignment" value="2"/>
+<attribute key="EventType_BiteMessage" value="3"/>
+<attribute key="EventType_FireEvent" value="4"/>
+<attribute key="EventType_HitBuilding" value="5"/>
+<attribute key="EventType_Manipulation" value="6"/>
+<attribute key="EventType_CameraVideo" value="8"/>
+<attribute key="EventType_RadioCnr" value="9"/>
+<attribute key="EventType_RadioTvc" value="10"/>
+<attribute key="EventType_HitEffectSimulation" value="13"/>
+<attribute key="EventType_HitMine" value="14"/>
+<attribute key="EventType_HitN" value="15"/>
+<attribute key="EventType_HitC" value="16"/>
+<attribute key="EventType_EnterDangerArea" value="17"/>
+<attribute key="EventType_LeaveDangerArea" value="18"/>
+<attribute key="EventType_EnterMineArea" value="19"/>
+<attribute key="EventType_LeaveMineArea" value="20"/>
+<attribute key="EventType_CrossLocalBorderline" value="21"/>
+<attribute key="EventType_EnterFunctionalArea" value="22"/>
+<attribute key="EventType_LeaveFunctionalArea" value="23"/>
+<attribute key="EventType_EnterNuclear" value="24"/>
+<attribute key="EventType_LeaveNuclear" value="25"/>
+<attribute key="EventType_CrossGlobalBorderline" value="26"/>
+<attribute key="EventType_HitB" value="27"/>
+<attribute key="EventType_FriendlyFire" value="28"/>
+<attribute key="EventType_HitGasPipe" value="29"/>
+<attribute key="EventType_MineArea" value="30"/>
+<attribute key="EventType_NContamination" value="31"/>
+<attribute key="EventType_BCContamination" value="32"/>
+<attribute key="EventType_DangerArea" value="33"/>
+<attribute key="EventType_FunctionalArea" value="34"/>
+<attribute key="EventType_MineCorridor" value="35"/>
+<attribute key="EventType_Borderline" value="36"/>
+<attribute key="EventType_TechnicalArea" value="37"/>
+<attribute key="EventType_GasPipe" value="38"/>
+<attribute key="EventType_Sanitation" value="39"/>
+<attribute key="EventType_EnterHazardDistance" value="42"/>
+<attribute key="EventType_LeaveHazardDistance" value="43"/>
+<attribute key="EventType_EquipmentErrorReport" value="100"/>
+<attribute key="EventType_EmergencyCall" value="112"/>
+<attribute key="EventType_AirSupport" value="44"/>
+<attribute key="EventType_ExplosionCluster" value="45"/>
+<attribute key="EventType_Jamming" value="46"/>
 </enumeration>
 <enumeration name="GearClass" table="pdm_gear_class">
-<attribute key="Unknown" value="0"/>
-<attribute key="Unspecified" value="1"/>
-<attribute key="Nuclear" value="2"/>
-<attribute key="Biological" value="3"/>
-<attribute key="Chemical" value="4"/>
-<attribute key="MineArea" value="5"/>
-<attribute key="MineSingle" value="6"/>
-<attribute key="Artillery" value="7"/>
-<attribute key="Mortar" value="8"/>
-<attribute key="Geopairing" value="9"/>
-<attribute key="DuelSim" value="10"/>
-<attribute key="FunctionalArea" value="11"/>
-<attribute key="TechnicalArea" value="12"/>
-<attribute key="GasPipe" value="16"/>
-<attribute key="AirSupport" value="17"/>
-      <attribute key="BoobyTrap" value="18"/>
-      <attribute key="OffRouteMine" value="19"/>
-      <attribute key="Rocket" value="20"/>
+<attribute key="GearClass_Unknown" value="0"/>
+<attribute key="GearClass_Unspecified" value="1"/>
+<attribute key="GearClass_Nuclear" value="2"/>
+<attribute key="GearClass_Biological" value="3"/>
+<attribute key="GearClass_Chemical" value="4"/>
+<attribute key="GearClass_MineArea" value="5"/>
+<attribute key="GearClass_MineSingle" value="6"/>
+<attribute key="GearClass_Artillery" value="7"/>
+<attribute key="GearClass_Mortar" value="8"/>
+<attribute key="GearClass_Geopairing" value="9"/>
+<attribute key="GearClass_DuelSim" value="10"/>
+<attribute key="GearClass_FunctionalArea" value="11"/>
+<attribute key="GearClass_TechnicalArea" value="12"/>
+<attribute key="GearClass_GasPipe" value="16"/>
+<attribute key="GearClass_AirSupport" value="17"/>
+      <attribute key="GearClass_BoobyTrap" value="18"/>
+      <attribute key="GearClass_OffRouteMine" value="19"/>
+      <attribute key="GearClass_Rocket" value="20"/>
 </enumeration>
 <enumeration name="HandgrenadeSearchMode">
-<attribute key="NoChange" value="0"/>
-<attribute key="Off" value="1"/>
-<attribute key="On" value="2"/>
+<attribute key="HandgrenadeSearchMode_NoChange" value="0"/>
+<attribute key="HandgrenadeSearchMode_Off" value="1"/>
+<attribute key="HandgrenadeSearchMode_On" value="2"/>
 </enumeration>
 <enumeration name="ABCProtectionMode">
-<attribute key="NoChange" value="0"/>
-<attribute key="Off" value="1"/>
-<attribute key="On" value="2"/>
+<attribute key="ABCProtectionMode_NoChange" value="0"/>
+<attribute key="ABCProtectionMode_Off" value="1"/>
+<attribute key="ABCProtectionMode_On" value="2"/>
 </enumeration>
 <enumeration name="HgrMineSearchFilterType" table="pdm_hgr_mine_search_filter_type">
-<attribute key="Unknown" value="0"/>
+<attribute key="HgrMineSearchFilterType_Unknown" value="0"/>
 <attribute key="Handgrenade" value="1"/>
 <attribute key="Mine" value="2"/>
 <attribute key="Claymore" value="3"/>
 <attribute key="Ied" value="4"/>
 </enumeration>
 <enumeration name="LanguageConfiguration">
-<attribute key="NoChange" value="0"/>
-<attribute key="German" value="1"/>
-<attribute key="English" value="2"/>
-<attribute key="French" value="3"/>
-<attribute key="Arabic" value="4"/>
-<attribute key="Spanish" value="5"/>
-<attribute key="Russian" value="6"/>
+<attribute key="LanguageConfiguration_NoChange" value="0"/>
+<attribute key="LanguageConfiguration_German" value="1"/>
+<attribute key="LanguageConfiguration_English" value="2"/>
+<attribute key="LanguageConfiguration_French" value="3"/>
+<attribute key="LanguageConfiguration_Arabic" value="4"/>
+<attribute key="LanguageConfiguration_Spanish" value="5"/>
+<attribute key="LanguageConfiguration_Russian" value="6"/>
 </enumeration>
 <enumeration name="OperationMode">
-<attribute key="NoChange" value="0"/>
-<attribute key="Normal" value="1"/>
-<attribute key="BeStill" value="2"/>
+<attribute key="OperationMode_NoChange" value="0"/>
+<attribute key="OperationMode_Normal" value="1"/>
+<attribute key="OperationMode_BeStill" value="2"/>
 </enumeration>
 <enumeration name="ParticipantType" table="pdm_participant_type">
-<attribute key="Participant" value="0"/>
-<attribute key="AggregateParticipant" value="1"/>
-<attribute key="ExerciseParticipant" value="2"/>
-<attribute key="SupportParticpant" value="3"/>
-<attribute key="Human" value="5"/>
-<attribute key="Vehicle" value="4"/>
-<attribute key="Soldier" value="6"/>
-<attribute key="Medical" value="7"/>
-<attribute key="Technician" value="8"/>
-<attribute key="Building" value="9"/>
-<attribute key="ObserverController" value="10"/>
+<attribute key="ParticipantType_Participant" value="0"/>
+<attribute key="ParticipantType_AggregateParticipant" value="1"/>
+<attribute key="ParticipantType_ExerciseParticipant" value="2"/>
+<attribute key="ParticipantType_SupportParticpant" value="3"/>
+<attribute key="ParticipantType_Human" value="5"/>
+<attribute key="ParticipantType_Vehicle" value="4"/>
+<attribute key="ParticipantType_Soldier" value="6"/>
+<attribute key="ParticipantType_Medical" value="7"/>
+<attribute key="ParticipantType_Technician" value="8"/>
+<attribute key="ParticipantType_Building" value="9"/>
+<attribute key="ParticipantType_ObserverController" value="10"/>
 </enumeration>
 <enumeration name="PersonalProtection">
-<attribute key="NoChange" value="0"/>
-<attribute key="Without" value="1"/>
-<attribute key="Suit" value="2"/>
-<attribute key="SuitAndGloves" value="3"/>
+<attribute key="PersonalProtection_NoChange" value="0"/>
+<attribute key="PersonalProtection_Without" value="1"/>
+<attribute key="PersonalProtection_Suit" value="2"/>
+<attribute key="PersonalProtection_SuitAndGloves" value="3"/>
 </enumeration>
 <enumeration name="ProtectionLevel">
-<attribute key="NoChange" value="0"/>
-<attribute key="IdzEs" value="1"/>
-<attribute key="IdzBs" value="2"/>
-<attribute key="Ksk" value="3"/>
-<attribute key="SoldierWithBodyArmor" value="4"/>
-<attribute key="SoldierActor" value="5"/>
+<attribute key="ProtectionLevel_NoChange" value="0"/>
+<attribute key="ProtectionLevel_IdzEs" value="1"/>
+<attribute key="ProtectionLevel_IdzBs" value="2"/>
+<attribute key="ProtectionLevel_Ksk" value="3"/>
+<attribute key="ProtectionLevel_SoldierWithBodyArmor" value="4"/>
+<attribute key="ProtectionLevel_SoldierActor" value="5"/>
 </enumeration>
 <enumeration name="StateChangeOriginator" table="pdm_state_change_originator">
-<attribute key="Unknown" value="0"/>
-<attribute key="Participant" value="1"/>
-<attribute key="AreaEffectSimulation" value="2"/>
-<attribute key="ObserverController" value="3"/>
-<attribute key="ExerciseControl" value="4"/>
-<attribute key="WoundTreatmentDevice" value="5"/>
-<attribute key="MaintainanceDevice" value="6"/>
-<attribute key="FunctionalArea" value="7"/>
-<attribute key="Initialization" value="8"/>
-<attribute key="MedicalTimeout" value="9"/>
-<attribute key="Sanitation" value="10"/>
-<attribute key="Party" value="11"/>
-<attribute key="ChargeEffect" value="12"/>
-<attribute key="ImprovisedExplosiveDevice" value="20"/>
-<attribute key="DusMine" value="21"/>
+<attribute key="StateChangeOriginator_Unknown" value="0"/>
+<attribute key="StateChangeOriginator_Participant" value="1"/>
+<attribute key="StateChangeOriginator_AreaEffectSimulation" value="2"/>
+<attribute key="StateChangeOriginator_ObserverController" value="3"/>
+<attribute key="StateChangeOriginator_ExerciseControl" value="4"/>
+<attribute key="StateChangeOriginator_WoundTreatmentDevice" value="5"/>
+<attribute key="StateChangeOriginator_MaintainanceDevice" value="6"/>
+<attribute key="StateChangeOriginator_FunctionalArea" value="7"/>
+<attribute key="StateChangeOriginator_Initialization" value="8"/>
+<attribute key="StateChangeOriginator_MedicalTimeout" value="9"/>
+<attribute key="StateChangeOriginator_Sanitation" value="10"/>
+<attribute key="StateChangeOriginator_Party" value="11"/>
+<attribute key="StateChangeOriginator_ChargeEffect" value="12"/>
+<attribute key="StateChangeOriginator_ImprovisedExplosiveDevice" value="20"/>
+<attribute key="StateChangeOriginator_DusMine" value="21"/>
 </enumeration>
 <enumeration name="VulnerabilityClass" table="pdm_vulnerability_class">
-<attribute key="Unknown" value="0"/>
-<attribute key="WtdDamages" value="1"/>
-<attribute key="WtdInjuries" value="2"/>
-<attribute key="BuildingDamages" value="3"/>
-<attribute key="VehicleDamages" value="4"/>
-<attribute key="SoldierInjuries" value="5"/>
+<attribute key="VulnerabilityClass_Unknown" value="0"/>
+<attribute key="VulnerabilityClass_WtdDamages" value="1"/>
+<attribute key="VulnerabilityClass_WtdInjuries" value="2"/>
+<attribute key="VulnerabilityClass_BuildingDamages" value="3"/>
+<attribute key="VulnerabilityClass_VehicleDamages" value="4"/>
+<attribute key="VulnerabilityClass_SoldierInjuries" value="5"/>
 </enumeration>
 <enumeration name="VulnerabilityState" table="pdm_vulnerability_state">
-<attribute key="NoChange" value="-1"/>
-<attribute key="CombatReady" value="0"/>
-<attribute key="LightDamage" value="1"/>
-<attribute key="MediumDamage" value="2"/>
-<attribute key="HeavyDamage" value="3"/>
-<attribute key="MobilityKill" value="4"/>
-<attribute key="VisibleMobilityKill" value="5"/>
-<attribute key="WeaponSystemDamage" value="6"/>
-<attribute key="VisibleWeaponSystemDamage" value="7"/>
-<attribute key="CatastrophicKill" value="8"/>
-<attribute key="TemporarySeverance" value="9"/>
-<attribute key="NearMiss" value="10"/>
-<attribute key="HitWithNoEffect" value="11"/>
-<attribute key="VulnerabilityBitsChanged" value="12"/>
-<attribute key="Reserved" value="13"/>
-<attribute key="NContamination" value="14"/>
-<attribute key="BContamination" value="15"/>
-<attribute key="CContamination" value="16"/>
-<attribute key="NotReady" value="99"/>
+<attribute key="VulnerabilityState_NoChange" value="-1"/>
+<attribute key="VulnerabilityState_CombatReady" value="0"/>
+<attribute key="VulnerabilityState_LightDamage" value="1"/>
+<attribute key="VulnerabilityState_MediumDamage" value="2"/>
+<attribute key="VulnerabilityState_HeavyDamage" value="3"/>
+<attribute key="VulnerabilityState_MobilityKill" value="4"/>
+<attribute key="VulnerabilityState_VisibleMobilityKill" value="5"/>
+<attribute key="VulnerabilityState_WeaponSystemDamage" value="6"/>
+<attribute key="VulnerabilityState_VisibleWeaponSystemDamage" value="7"/>
+<attribute key="VulnerabilityState_CatastrophicKill" value="8"/>
+<attribute key="VulnerabilityState_TemporarySeverance" value="9"/>
+<attribute key="VulnerabilityState_NearMiss" value="10"/>
+<attribute key="VulnerabilityState_HitWithNoEffect" value="11"/>
+<attribute key="VulnerabilityState_VulnerabilityBitsChanged" value="12"/>
+<attribute key="VulnerabilityState_Reserved" value="13"/>
+<attribute key="VulnerabilityState_NContamination" value="14"/>
+<attribute key="VulnerabilityState_BContamination" value="15"/>
+<attribute key="VulnerabilityState_CContamination" value="16"/>
+<attribute key="VulnerabilityState_NotReady" value="99"/>
 </enumeration>
 <enumeration name="WphMode">
-<attribute key="NoChange" value="0"/>
-<attribute key="Without" value="1"/>
-<attribute key="With" value="2"/>
+<attribute key="WphMode_NoChange" value="0"/>
+<attribute key="WphMode_Without" value="1"/>
+<attribute key="WphMode_With" value="2"/>
 </enumeration>
     <enumeration name="ChargeTypeProperty">
       <attribute key="None" value="0"/>
@@ -1530,9 +1530,9 @@
 <attribute key="Resident" value="2"/>
 </enumeration>
 <enumeration name="InternationalMode">
-<attribute key="NoChange" value="0"/>
-<attribute key="Off" value="1"/>
-<attribute key="On" value="2"/>
+<attribute key="InternationalMode_NoChange" value="0"/>
+<attribute key="InternationalMode_Off" value="1"/>
+<attribute key="InternationalMode_On" value="2"/>
 </enumeration>
 <enumeration name="AvmFrequencyPlanTransmissionReason">
 <attribute key="NA" value="0"/>
@@ -1545,17 +1545,17 @@
 <attribute key="OptimalTreatment" value="65"/>
 </enumeration>
 <enumeration name="UasState" table="pdm_uas_state">
-  <attribute key="Undefined" value="0"/>
-  <attribute key="Off" value="1"/>
-  <attribute key="On" value="2"/>
-  <attribute key="Standby" value="3"/>
-  <attribute key="Init" value="4"/>
-  <attribute key="Shutdown" value="5"/>
-  <attribute key="Normal" value="6"/>
-  <attribute key="Manual" value="7"/>
-  <attribute key="Auto" value="8"/>
-  <attribute key="Calibrating" value="9"/>
-  <attribute key="Maintenance" value="10"/>
+  <attribute key="UasState_Undefined" value="0"/>
+  <attribute key="UasState_Off" value="1"/>
+  <attribute key="UasState_On" value="2"/>
+  <attribute key="UasState_Standby" value="3"/>
+  <attribute key="UasState_Init" value="4"/>
+  <attribute key="UasState_Shutdown" value="5"/>
+  <attribute key="UasState_Normal" value="6"/>
+  <attribute key="UasState_Manual" value="7"/>
+  <attribute key="UasState_Auto" value="8"/>
+  <attribute key="UasState_Calibrating" value="9"/>
+  <attribute key="UasState_Maintenance" value="10"/>
 </enumeration>
 <enumeration name="UasActionTask" table="pdm_uas_action_task">
   <attribute key="Undefined" value="0"/>

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp

@@ -21,11 +21,11 @@ static QString toStringBuilding(VulnerabilityState vs)
   switch (vs)
   {
 #ifdef ETS_MODE
-  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
-  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
+  case VulnerabilityState::VulnerabilityState_CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
 #else
-  case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
-  case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
+  case VulnerabilityState::VulnerabilityState_CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
 #endif
   default: break;
   }
@@ -37,33 +37,33 @@ static QString toStringVehicle(VulnerabilityState vs)
   switch (vs)
   {
 #ifdef ETS_MODE
-  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");
+  case VulnerabilityState::VulnerabilityState_CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  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
+  case VulnerabilityState::VulnerabilityState_LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_CombatReady:
+  case VulnerabilityState::VulnerabilityState_NoChange:
+  case VulnerabilityState::VulnerabilityState_TemporarySeverance:
+  case VulnerabilityState::VulnerabilityState_NearMiss:
+  case VulnerabilityState::VulnerabilityState_HitWithNoEffect:
+  case VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
+  case VulnerabilityState::VulnerabilityState_NContamination:
+  case VulnerabilityState::VulnerabilityState_BContamination:
+  case VulnerabilityState::VulnerabilityState_CContamination:
+  case VulnerabilityState::VulnerabilityState_NotReady:  // Internal
+  case VulnerabilityState::VulnerabilityState_Reserved:  // Internal
     break;  // use common translation from toString()
 #endif
   }
@@ -76,35 +76,35 @@ static QString toStringSoldier(VulnerabilityState vs)
   switch (vs)
   {
 #ifdef ETS_MODE
-  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");
+  case VulnerabilityState::VulnerabilityState_CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  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:
+  case VulnerabilityState::VulnerabilityState_LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState::VulnerabilityState_CombatReady:
+  case VulnerabilityState::VulnerabilityState_TemporarySeverance:
+  case VulnerabilityState::VulnerabilityState_NearMiss:
+  case VulnerabilityState::VulnerabilityState_HitWithNoEffect:
+  case VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged:
+  case VulnerabilityState::VulnerabilityState_NContamination:
+  case VulnerabilityState::VulnerabilityState_BContamination:
+  case VulnerabilityState::VulnerabilityState_CContamination:
+  case VulnerabilityState::VulnerabilityState_NoChange:
     break;  // use common translation from toString()
   // those should not happen ...
-  case VulnerabilityState::MobilityKill:
-  case VulnerabilityState::VisibleMobilityKill:
-  case VulnerabilityState::NotReady:  // Internal
-  case VulnerabilityState::Reserved:  // Internal
+  case VulnerabilityState::VulnerabilityState_MobilityKill:
+  case VulnerabilityState::VulnerabilityState_VisibleMobilityKill:
+  case VulnerabilityState::VulnerabilityState_NotReady:  // Internal
+  case VulnerabilityState::VulnerabilityState_Reserved:  // Internal
     break;
 #endif
   }
@@ -115,15 +115,15 @@ QString toString(VulnerabilityState vs, VulnerabilityClass vc)
 {
   switch (vc)
   {
-  case VulnerabilityClass::Unknown:
-  case VulnerabilityClass::WtdDamages:
-  case VulnerabilityClass::WtdInjuries:
+  case VulnerabilityClass::VulnerabilityClass_Unknown:
+  case VulnerabilityClass::VulnerabilityClass_WtdDamages:
+  case VulnerabilityClass::VulnerabilityClass_WtdInjuries:
     return toString(vs);
-  case VulnerabilityClass::BuildingDamages:
+  case VulnerabilityClass::VulnerabilityClass_BuildingDamages:
     return toStringBuilding(vs);
-  case VulnerabilityClass::VehicleDamages:
+  case VulnerabilityClass::VulnerabilityClass_VehicleDamages:
     return toStringVehicle(vs);
-  case VulnerabilityClass::SoldierInjuries:
+  case VulnerabilityClass::VulnerabilityClass_SoldierInjuries:
     return toStringSoldier(vs);
   }
   return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));