Migrates residual Lts sources to generated rtiddsgen API

Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CameraVideo/tln_camera_video_filter.cpp

@@ -480,7 +480,7 @@ void CameraVideoFilter::onMainStructureElementChanged(const InfrastructureManage
   {
     case DataModification::eAdded:
     case DataModification::eModified:
-      m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building ? m_ismDtc->getBuildingDisplayName(data.id())
+      m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
                                                                                                                                          : QString::fromStdString(data.description());
       break;
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp

@@ -72,8 +72,8 @@ void CrossBorderlineFilter::updateFilterString()
   }
 
   m_filterString = QStringLiteral(" WHEN event_type_id = %1 OR event_type_id = %2")
-      .arg(int(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline))
-      .arg(int(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline));
+      .arg(int(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline))
+      .arg(int(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline));
 
   if (m_attributes[CrossBorderlineEventFactory::s_global].isEmpty() &&
       m_attributes[CrossBorderlineEventFactory::s_sampleTime].isEmpty())

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp

@@ -144,7 +144,7 @@ void FireEventFilter::updateFilterString()
 
 void FireEventFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
 {
-  if (data.gearClassId() != ProjectDataManagement::GearClass_def::DuelSim || data.name() == "N/A")
+  if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
     return;
 
   switch (modType)
@@ -165,7 +165,7 @@ void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeTyp
   if (data.id() < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
     return;
 
   const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp

@@ -74,19 +74,19 @@ bool HitFilter::init(
 
   if (m_vulnerabilityStates.isEmpty())
   {
-    using VulnerabilityState = ProjectDataManagement::VulnerabilityState_def;
-    m_vulnerabilityStates.insert(VulnerabilityState::CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState_def::CombatReady));
-    m_vulnerabilityStates.insert(VulnerabilityState::LightDamage, ProjectDataManagement::toString(VulnerabilityState::LightDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::MediumDamage, ProjectDataManagement::toString(VulnerabilityState::MediumDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::HeavyDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::MobilityKill, ProjectDataManagement::toString(VulnerabilityState::MobilityKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VisibleMobilityKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::WeaponSystemDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VisibleWeaponSystemDamage));
-    m_vulnerabilityStates.insert(VulnerabilityState::CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::CatastrophicKill));
-    m_vulnerabilityStates.insert(VulnerabilityState::TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::TemporarySeverance));
-    m_vulnerabilityStates.insert(VulnerabilityState::NearMiss, ProjectDataManagement::toString(VulnerabilityState::NearMiss));
-    m_vulnerabilityStates.insert(VulnerabilityState::HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::HitWithNoEffect));
+    using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_LightDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MediumDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_NearMiss, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect));
   }
 
   if (m_partys.isEmpty())
@@ -272,7 +272,7 @@ void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &dat
   if (data.id() < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
     return;
 
   const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h

@@ -40,7 +40,7 @@ public:
   bool check(const AbstractEventItem &item) const override;
 
   int originatorEquipmentNumber(int id) const { return m_originatorEquipmentNumbers.value(id, 0); }
-  QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(id)); }
+  QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState>(id)); }
   QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
   QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp

@@ -102,7 +102,7 @@ bool HitBuildingFilter::init(
 
   if (m_aesTypes.isEmpty())
   {
-    using AesType = AreaEffectSimulation::AesType_def::type;
+    using AesType = AreaEffectSimulation::AesType;
 
 
     m_aesTypes.insert(static_cast<int>(AesType::AtExplosionArea), AreaEffectSimulation::toString(AesType::AtExplosionArea));
@@ -123,8 +123,8 @@ bool HitBuildingFilter::init(
 
   if (m_vulnerabilityStates.isEmpty())
   {
-    using VulnerabilityState = ProjectDataManagement::VulnerabilityState_def;
-    m_vulnerabilityStates.insert(VulnerabilityState::CombatReady, ProjectDataManagement::toString(VulnerabilityState::CombatReady));
+    using VulnerabilityState = ProjectDataManagement::VulnerabilityState;
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady));
 
 
 
@@ -132,7 +132,7 @@ bool HitBuildingFilter::init(
 
 
 
-    m_vulnerabilityStates.insert(VulnerabilityState::CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::CatastrophicKill));
+    m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill));
 
 
 
@@ -410,7 +410,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
   bool isOutdoor = true;
   for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements()))
   {
-    if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::OutdoorCamera)
+    if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera)
     {
       isOutdoor = false;
       break;
@@ -423,7 +423,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage
   {
   case DataModification::eAdded:
   case DataModification::eModified:
-    m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building ? m_ismDtc->getBuildingDisplayName(data.id())
+    m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id())
                                                                                                                                        : QString::fromStdString(data.description());
     break;
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h

@@ -41,10 +41,10 @@ public:
   void addWidgetsToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const override;
   bool check(const AbstractEventItem &item) const override;
 
-  QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType_def::type>(id)); }
+  QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType>(id)); }
   QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
   QString mainStructureElement(int id) const { return m_ismDtc->getBuildingDisplayName(id); }
-  QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(id)); }
+  QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState>(id)); }
   QString getChargeTypeShortName(int id);
   
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp

@@ -64,7 +64,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr<ProjectDataManagement::Inte
   {
     try
     {
-      using AesType = AreaEffectSimulation::AesType_def::type;
+      using AesType = AreaEffectSimulation::AesType;
       m_aesTypes.insert(static_cast<int>(AesType::AtNContamination), AreaEffectSimulation::toString(AesType::AtNContamination));
       m_aesTypes.insert(static_cast<int>(AesType::AtBCContamination), AreaEffectSimulation::toString(AesType::AtBCContamination));
       m_aesTypes.insert(static_cast<int>(AesType::AtExplosionArea), AreaEffectSimulation::toString(AesType::AtExplosionArea));
@@ -190,7 +190,7 @@ void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement:
   if (data.id() < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass_def::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass::DuelSim)
     return;
 
   const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h

@@ -34,7 +34,7 @@ public:
   void addWidgetsToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const override;
   bool check(const AbstractEventItem &item) const override;
 
-  QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType_def::type>(id)); }
+  QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType>(id)); }
   QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); }
 
   static const std::vector<int> s_originatorChargeTypesIds;

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp

@@ -162,7 +162,7 @@ void WeaponAssignmentFilter::updateFilterString()
 
 void WeaponAssignmentFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType)
 {
-  if (data.gearClassId() != ProjectDataManagement::GearClass_def::DuelSim || data.name() == "N/A")
+  if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A")
     return;
 
   switch (modType)
@@ -183,7 +183,7 @@ void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::Ch
   if (data.id() < 1)
     return;
 
-  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim)
+  if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim)
     return;
 
   const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object();

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp

@@ -232,7 +232,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
     if (!ele.isDouble())
       return QVariant();
     const int aesTypeId = ele.toInt();
-    return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType_def::type>(aesTypeId));
+    return AreaEffectSimulation::toString(static_cast<AreaEffectSimulation::AesType>(aesTypeId));
   }
   case Columns::AesId:
   {
@@ -320,7 +320,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const
     if (!ele.isDouble())
       return QVariant();
     const int vId = ele.toInt();
-    return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState_def::type>(vId));
+    return ProjectDataManagement::toString(static_cast<ProjectDataManagement::VulnerabilityState>(vId));
   }
   case Columns::MarkerNote:
   {

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp

@@ -126,8 +126,8 @@ TimelineDialog::TimelineDialog(
   if (m_exerciseEnd == 0)
     throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id());
   if (m_session->app() == LtsAppDescriptor::App::ThpSituationReplay ||
-      exc.state() == ExerciseManagement::ExerciseState_def::Paused ||
-      exc.state() == ExerciseManagement::ExerciseState_def::Stopped)
+      exc.state() == ExerciseManagement::ExerciseState::Paused ||
+      exc.state() == ExerciseManagement::ExerciseState::Stopped)
   {
     m_range.maxEndSecs = m_exerciseEnd / 1000LL;
     m_range.maxEndMSecs = static_cast<qint64>(m_range.maxEndSecs) * 1000LL; 
@@ -477,7 +477,7 @@ void TimelineDialog::onDebugCreateFakeEvent()
     }
 
     m_model->onLiveEvent(ExerciseEventManagement::Event(uniqueId, start,
-                                                        ProjectDataManagement::PdmEventType(static_cast<ProjectDataManagement::PdmEventType::inner_enum>(typeId)),
+                                                        ProjectDataManagement::PdmEventType(static_cast<ProjectDataManagement::PdmEventType>(typeId)),
                                                         participantId, partyId, eqId, te->toPlainText().toStdString(), {}));
   });
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp

@@ -608,9 +608,9 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
   auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t)
   {
     int type = (int)eemEvent.eventTypeId().underlying();
-    if (type == ProjectDataManagement::PdmEventType_def::CameraVideo
-        || type == ProjectDataManagement::PdmEventType_def::RadioTvc
-        || type == ProjectDataManagement::PdmEventType_def::RadioCnr)
+    if (type == ProjectDataManagement::PdmEventType::EventType_CameraVideo
+        || type == ProjectDataManagement::PdmEventType::EventType_RadioTvc
+        || type == ProjectDataManagement::PdmEventType::EventType_RadioCnr)
     {
       int duration = properties[QStringLiteral("duration")].toInt(0);
 
@@ -722,8 +722,8 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
 
   
   EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
-  if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline ||
-      eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline) 
+  if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline ||
+      eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline) 
     eventType = EventType::CrossBorderline;
 
   EventItemPtr eventItem;
@@ -1473,7 +1473,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem)
       const QString &streamName = cameraVideoItem.internalStreamName();
       InfrastructureManagement::StructureElement structureElement;
       m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
-      bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::OutdoorCamera;
+      bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
 
       if (!m_mainStructureElements.contains(msei) && msei != 0 )
         throw QStringLiteral("camera video event with msei %1 is not inside msei list (maybe building not mapped into current exercise)").arg(msei);
@@ -2053,7 +2053,7 @@ void TimelineModel::getBuildings()
     
 
 
-    if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Building
+    if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building
         || !m_ismDtc->isElementAssignedToExercise(mse, m_session->exerciseId())) 
       continue;
 
@@ -2094,9 +2094,9 @@ void TimelineModel::getBuildings()
     int mappingCounter = 0;
     for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements()))
     {
-      if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::MountingPoint
-          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::OutdoorCamera
-          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::IndoorCamera)
+      if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint
+          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera
+          && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera)
         continue;
 
       m_mountingPointsToMainStructureElementMapping.insert(se.id(), msei);
@@ -2230,7 +2230,7 @@ void TimelineModel::getBuildingVideoStreams()
 
   for (auto it1 = streams.constBegin(); it1 != streams.constEnd(); ++it1)
   {
-    if (it1->type() != AudioVideoManagement::StreamType_def::Video)
+    if (it1->type() != AudioVideoManagement::StreamType::Video)
       continue;
 
     int32_t mountingPointId = it1->mountingPointId();
@@ -2273,7 +2273,7 @@ void TimelineModel::getBuildingVideoStreams()
     int msei = it2.value();
     InfrastructureManagement::StructureElement structureElement;
     m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement);
-    bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::OutdoorCamera;
+    bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera;
 
     if (isOutdoorCameraStream)
     {

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp

@@ -13,115 +13,115 @@ QString eventTypeString(EventType eventType)
   switch (eventType)
   {
   case EventType::Hit:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Hit);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Hit);
 
   case EventType::WeaponAssignment:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::WeaponAssignment);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_WeaponAssignment);
 
   case EventType::BiteMessage:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BiteMessage);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_BiteMessage);
 
   case EventType::FireEvent:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FireEvent);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FireEvent);
 
   case EventType::HitBuilding:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitBuilding);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitBuilding);
 
   case EventType::Manipulation:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Manipulation);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Manipulation);
 
   case EventType::CameraVideo:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::CameraVideo);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_CameraVideo);
 
   case EventType::RadioCnr:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioCnr);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_RadioCnr);
 
   case EventType::RadioTvc:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioTvc);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_RadioTvc);
 
   case EventType::HitEffectSimulation:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
 
   case EventType::HitMine:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitMine);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitMine);
 
   case EventType::HitN:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitN);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitN);
 
   case EventType::HitC:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitC);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitC);
 
   case EventType::EnterDangerArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterDangerArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea);
 
   case EventType::LeaveDangerArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
 
   case EventType::EnterMineArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterMineArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterMineArea);
 
   case EventType::LeaveMineArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveMineArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea);
 
   case EventType::CrossBorderline:
     return QCoreApplication::translate("EventType", "CrossBorderline"); 
 
   case EventType::EnterFunctionalArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea);
 
   case EventType::LeaveFunctionalArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea);
 
   case EventType::EnterNuclear:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterNuclear);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterNuclear);
 
   case EventType::LeaveNuclear:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveNuclear);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear);
 
   case EventType::HitB:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitB);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitB);
 
   case EventType::FriendlyFire:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FriendlyFire);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FriendlyFire);
 
   case EventType::HitGasPipe:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitGasPipe);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitGasPipe);
 
   case EventType::MineArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_MineArea);
 
   case EventType::NContamination:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::NContamination);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_NContamination);
 
   case EventType::BCContamination:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BCContamination);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_BCContamination);
 
   case EventType::DangerArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::DangerArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_DangerArea);
 
   case EventType::FunctionalArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FunctionalArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FunctionalArea);
 
   case EventType::MineCorridor:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineCorridor);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_MineCorridor);
 
   case EventType::Borderline:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Borderline);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Borderline);
 
   case EventType::TechnicalArea:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::TechnicalArea);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_TechnicalArea);
 
   case EventType::GasPipe:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::GasPipe);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_GasPipe);
 
   case EventType::Sanitation:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Sanitation);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Sanitation);
 
   case EventType::EquipmentErrorReport:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EquipmentErrorReport);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport);
 
   case EventType::EmergencyCall:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EmergencyCall);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EmergencyCall);
 
   case EventType::Marker:
     return QCoreApplication::translate("EventType", "Marker");
@@ -131,7 +131,7 @@ QString eventTypeString(EventType eventType)
 
   case EventType::Unknown:
   default:
-    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Unknown);
+    return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Unknown);
   }
   Q_UNREACHABLE();
 }
@@ -191,8 +191,8 @@ EventType toEventType(int eventType)
   case EventType::LeaveMineArea:
     return EventType::LeaveMineArea;
 
-  case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline:
-  case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline:
+  case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline:
+  case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline:
     return EventType::CrossBorderline;
 
   case EventType::EnterFunctionalArea:

qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h

@@ -10,46 +10,46 @@ namespace Timeline
 
 enum EventType
 {
-  Unknown = ProjectDataManagement::PdmEventType_def::Unknown,
-  Hit = ProjectDataManagement::PdmEventType_def::Hit,
-  WeaponAssignment = ProjectDataManagement::PdmEventType_def::WeaponAssignment,
-  BiteMessage = ProjectDataManagement::PdmEventType_def::BiteMessage,
-  FireEvent = ProjectDataManagement::PdmEventType_def::FireEvent,
-  HitBuilding = ProjectDataManagement::PdmEventType_def::HitBuilding,
-  Manipulation = ProjectDataManagement::PdmEventType_def::Manipulation,
-  CameraVideo = ProjectDataManagement::PdmEventType_def::CameraVideo,
-  RadioCnr = ProjectDataManagement::PdmEventType_def::RadioCnr,
-  RadioTvc = ProjectDataManagement::PdmEventType_def::RadioTvc,
-  HitEffectSimulation = ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
-  HitMine = ProjectDataManagement::PdmEventType_def::HitMine,
-  HitN = ProjectDataManagement::PdmEventType_def::HitN,
-  HitC = ProjectDataManagement::PdmEventType_def::HitC,
-  EnterDangerArea = ProjectDataManagement::PdmEventType_def::EnterDangerArea,
-  LeaveDangerArea = ProjectDataManagement::PdmEventType_def::LeaveDangerArea,
-  EnterMineArea = ProjectDataManagement::PdmEventType_def::EnterMineArea,
-  LeaveMineArea = ProjectDataManagement::PdmEventType_def::LeaveMineArea,
-  CrossBorderline = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline,
+  Unknown = ProjectDataManagement::PdmEventType::EventType_Unknown,
+  Hit = ProjectDataManagement::PdmEventType::EventType_Hit,
+  WeaponAssignment = ProjectDataManagement::PdmEventType::EventType_WeaponAssignment,
+  BiteMessage = ProjectDataManagement::PdmEventType::EventType_BiteMessage,
+  FireEvent = ProjectDataManagement::PdmEventType::EventType_FireEvent,
+  HitBuilding = ProjectDataManagement::PdmEventType::EventType_HitBuilding,
+  Manipulation = ProjectDataManagement::PdmEventType::EventType_Manipulation,
+  CameraVideo = ProjectDataManagement::PdmEventType::EventType_CameraVideo,
+  RadioCnr = ProjectDataManagement::PdmEventType::EventType_RadioCnr,
+  RadioTvc = ProjectDataManagement::PdmEventType::EventType_RadioTvc,
+  HitEffectSimulation = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation,
+  HitMine = ProjectDataManagement::PdmEventType::EventType_HitMine,
+  HitN = ProjectDataManagement::PdmEventType::EventType_HitN,
+  HitC = ProjectDataManagement::PdmEventType::EventType_HitC,
+  EnterDangerArea = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea,
+  LeaveDangerArea = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea,
+  EnterMineArea = ProjectDataManagement::PdmEventType::EventType_EnterMineArea,
+  LeaveMineArea = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea,
+  CrossBorderline = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline,
 
-  EnterFunctionalArea = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea,
-  LeaveFunctionalArea = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea,
-  EnterNuclear = ProjectDataManagement::PdmEventType_def::EnterNuclear,
-  LeaveNuclear = ProjectDataManagement::PdmEventType_def::LeaveNuclear,
+  EnterFunctionalArea = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea,
+  LeaveFunctionalArea = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea,
+  EnterNuclear = ProjectDataManagement::PdmEventType::EventType_EnterNuclear,
+  LeaveNuclear = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear,
 
-  HitB = ProjectDataManagement::PdmEventType_def::HitB,
-  FriendlyFire = ProjectDataManagement::PdmEventType_def::FriendlyFire,
-  HitGasPipe = ProjectDataManagement::PdmEventType_def::HitGasPipe,
-  MineArea = ProjectDataManagement::PdmEventType_def::MineArea,
-  NContamination = ProjectDataManagement::PdmEventType_def::NContamination,
-  BCContamination = ProjectDataManagement::PdmEventType_def::BCContamination,
-  DangerArea = ProjectDataManagement::PdmEventType_def::DangerArea,
-  FunctionalArea = ProjectDataManagement::PdmEventType_def::FunctionalArea,
-  MineCorridor = ProjectDataManagement::PdmEventType_def::MineCorridor,
-  Borderline = ProjectDataManagement::PdmEventType_def::Borderline,
-  TechnicalArea = ProjectDataManagement::PdmEventType_def::TechnicalArea,
-  GasPipe = ProjectDataManagement::PdmEventType_def::GasPipe,
-  Sanitation = ProjectDataManagement::PdmEventType_def::Sanitation,
-  EquipmentErrorReport = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport,
-  EmergencyCall = ProjectDataManagement::PdmEventType_def::EmergencyCall,
+  HitB = ProjectDataManagement::PdmEventType::EventType_HitB,
+  FriendlyFire = ProjectDataManagement::PdmEventType::EventType_FriendlyFire,
+  HitGasPipe = ProjectDataManagement::PdmEventType::EventType_HitGasPipe,
+  MineArea = ProjectDataManagement::PdmEventType::EventType_MineArea,
+  NContamination = ProjectDataManagement::PdmEventType::EventType_NContamination,
+  BCContamination = ProjectDataManagement::PdmEventType::EventType_BCContamination,
+  DangerArea = ProjectDataManagement::PdmEventType::EventType_DangerArea,
+  FunctionalArea = ProjectDataManagement::PdmEventType::EventType_FunctionalArea,
+  MineCorridor = ProjectDataManagement::PdmEventType::EventType_MineCorridor,
+  Borderline = ProjectDataManagement::PdmEventType::EventType_Borderline,
+  TechnicalArea = ProjectDataManagement::PdmEventType::EventType_TechnicalArea,
+  GasPipe = ProjectDataManagement::PdmEventType::EventType_GasPipe,
+  Sanitation = ProjectDataManagement::PdmEventType::EventType_Sanitation,
+  EquipmentErrorReport = ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport,
+  EmergencyCall = ProjectDataManagement::PdmEventType::EventType_EmergencyCall,
   Marker = 666,
   Block = 999,
 };