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/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp

@@ -109,7 +109,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
   ERROR_LOG(m_logger) << "Try send notification0";
   m_aesId = replyObject.id();
   ProjectDataManagement::EffectSource effectSource
-      = static_cast<ProjectDataManagement::EffectSource::type>(propertiesObject.value(QStringLiteral("effectSource")).toInt());
+      = static_cast<ProjectDataManagement::EffectSource>(propertiesObject.value(QStringLiteral("effectSource")).toInt());
   ERROR_LOG(m_logger) << "Try send notification1 " << effectSource;
 
   if (effectSource != ProjectDataManagement::EffectSource::ES_ADLER)
@@ -178,7 +178,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep
     addr.isRead(false);
     const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId);
     addr.name(user.name());
-    addr.addressType(NotificationManagement::AddressType_def::Operator);
+    addr.addressType(NotificationManagement::AddressType::Operator);
     recipentVec.emplace_back(addr);
   }
   req.notification().recipientIds(recipentVec);
@@ -252,7 +252,7 @@ void AesHandler::onAirSupportImpactModifyReply(const Core::FunctionReplyObject &
 void AesHandler::handleCreateSingleExplosion(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data)
 {
   auto strFromObj = QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact);
-  m_singleExplosions.insert(data.aesDdsId, AreaEffectSimulation::AesEffectState_def::EsCreated);
+  m_singleExplosions.insert(data.aesDdsId, AreaEffectSimulation::AesEffectState::EsCreated);
   DEBUG_LOG(m_logger) << "TEST SINGLE EXPLOSION CREATED " << strFromObj;
 }
 
@@ -958,11 +958,11 @@ QList<qint32> AesHandler::findAllPendingEffectCluster(int partyId)
   {
     if (effectCluster.partyId() != partyId)
       continue;
-    if (effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived
-        && effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated)
+    if (effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived
+        && effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated)
       continue;
-    if (effectCluster.effectSourceId() != ProjectDataManagement::EffectSource_def::ES_ADLER /*&&
-            effectCluster.effectSourceId() != ProjectDataManagement::EffectSource_def::ES_ADLER_STANDALONE*/)
+    if (effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER /*&&
+            effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE*/)
       continue;
 
     ret.append(effectCluster.id());
@@ -1096,8 +1096,8 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS
     m_singleExplosions.insert(data.id(), data.effectStateId());
     return;
   }
-  if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated
-      && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState_def::EsActivated)
+  if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated
+      && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState::EsActivated)
   {
     const auto state = data.effectStateId();
     DEBUG_LOG(m_logger) << "----------------- switch state ------------- " << state;

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp

@@ -173,8 +173,8 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
 
   int prio = s->getInteger(QStringLiteral("NOM/notificationPriority"), 3); 
   DEBUG_LOG(m_logger) << " Setting: NotificationPriority: " << prio;
-  notif.priority(static_cast<NotificationManagement::Priority_def::type>(prio));
-  notif.processedPriority(NotificationManagement::Priority_def::Low);
+  notif.priority(static_cast<NotificationManagement::Priority>(prio));
+  notif.processedPriority(NotificationManagement::Priority::Low);
   notif.exerciseId(m_exerciseId);
 
   for (const auto &userId : m_opmDtc->getOperatorsByOperatorRight(OperatorRights::FileManagementFilesEdit))
@@ -183,7 +183,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con
     addr.addressId(userId);
     addr.isRead(false);
     addr.name(m_opmDtc->user(userId).name());
-    addr.addressType(NotificationManagement::AddressType_def::Operator);
+    addr.addressType(NotificationManagement::AddressType::Operator);
     notif.recipientIds().push_back(addr);
   }
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp

@@ -120,7 +120,7 @@ int JsonDispatcher::getAssetId(const QString &saaName) const
 
   for (const auto &currAsset : m_mainDispatcher->asmHandler()->getDtc()->assets())
   {
-    if (currAsset.assetTypeId() != AssetManagement::AssetType_def::AdlerSAA)
+    if (currAsset.assetTypeId() != AssetManagement::AssetType::AdlerSAA)
       continue;
     const auto &dbSaa = saaNameFromProps(currAsset.properties());
 
@@ -335,7 +335,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const
   DEBUG_LOG(m_logger) << "onSAARegistration modifyParty"
                       << " ==> SAA name " << saaName;
   createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "Reconnect to SAA")),
-                            NotificationManagement::MessageType_def::Success,
+                            NotificationManagement::MessageType::Success,
                             NotificationManagement::NotificationType::AdlerNotification,
                             saaName,
                             {});
@@ -357,7 +357,7 @@ void JsonDispatcher::onSAADeregistration(const int wsId, const int partyId)
     const int assetId = getAssetId(saa->getSAAName());
     DEBUG_LOG(m_logger) << "Deregistation from " << saa->getSAAName();
     createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "SAADeregistration")),
-                              NotificationManagement::MessageType_def::Info,
+                              NotificationManagement::MessageType::Info,
                               NotificationManagement::NotificationType::AdlerNotification,
                               saa->getSAAName(),
                               {});
@@ -424,7 +424,7 @@ void JsonDispatcher::onSAAStatus(const int wsId, const EXStatus &status)
     }
     createNotificationRequest(wsId,
                               title,
-                              NotificationManagement::MessageType_def::Success,
+                              NotificationManagement::MessageType::Success,
                               NotificationManagement::NotificationType::AdlerNotification,
                               saa->getSAAName(),
                               {});
@@ -465,7 +465,7 @@ void JsonDispatcher::onSAAExceptionStatus(const int wsId, const TechnischeDaten
 
   args << exceptionStatus.beschreibung;
   createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification","Error Message from SAA")),
-                            NotificationManagement::MessageType_def::Error,
+                            NotificationManagement::MessageType::Error,
                             NotificationManagement::NotificationType::AdlerNotification,
                             content,
                             args);
@@ -547,7 +547,7 @@ void JsonDispatcher::sendParticipantInfoNotification(const int wsId, const int p
 
   createNotificationRequest(wsId,
                             QString::fromUtf8(tr_lts("Notification","Loading Point Position Report")),
-                            NotificationManagement::MessageType_def::Info,
+                            NotificationManagement::MessageType::Info,
                             NotificationManagement::NotificationType::AdlerNotification,
                             content,
                             args);
@@ -664,7 +664,7 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer
   }
   createNotificationRequest(wsId,
                             QString::fromUtf8(tr_lts("Notification","Hold your fire")),
-                            NotificationManagement::MessageType_def::Info,
+                            NotificationManagement::MessageType::Info,
                             NotificationManagement::NotificationType::CombatOrder,
                             saa->getSAAName(),
                             {});
@@ -811,7 +811,7 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId
   exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.longitude = request.positionTarget().lon() * 180.0 / M_PI;
   exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.hoehe = request.positionTarget().z();
 
-  exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType::inner_enum(request.weaponSystemType().underlying() + 1);
+  exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType(request.weaponSystemType().underlying() + 1);
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  weaponSystemType " << request.weaponSystemType().underlying();
 
   DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77  L26_EffectingSystemType " << exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem;
@@ -917,8 +917,8 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
   notif.contentArgs(args);
   notif.timeStamp(currentTime);
   notif.expiryTime(expiryTime);
-  notif.priority(NotificationManagement::Priority_def::High);
-  notif.processedPriority(NotificationManagement::Priority_def::High);
+  notif.priority(NotificationManagement::Priority::High);
+  notif.processedPriority(NotificationManagement::Priority::High);
   notif.exerciseId(m_mainDispatcher->exerciseId());
 
   const QVector<int> recipientIds = m_mainDispatcher->ddsHandler()->dtcOpm()->getNotificationRecipents(m_mainDispatcher->exerciseId(),
@@ -937,7 +937,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
     addr.isRead(false);
     const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId);
     addr.name(user.name());
-    addr.addressType(NotificationManagement::AddressType_def::Operator);
+    addr.addressType(NotificationManagement::AddressType::Operator);
     notif.recipientIds().push_back(addr);
     DEBUG_LOG(m_logger) << "recipientId=" << addr.name()
                         << ", addr.addressId=" << addr.addressId();
@@ -945,7 +945,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId,
 
   NotificationManagement::Address addrSender;
   addrSender.name(saa->getSAAName().toStdString());
-  addrSender.addressType(NotificationManagement::AddressType_def::Service);
+  addrSender.addressType(NotificationManagement::AddressType::Service);
   notif.sender(addrSender);
 
   data.notification(notif);

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp

@@ -105,7 +105,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::Init &data)
   msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::ExerciseControl;
   msg.tasVitality = 100;
   msg.vulnerabilityBits = 0;
-  msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady;
+  msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady;
 
   m_sendToDds->rxData(msg);
   return true;
@@ -193,7 +193,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
   msg.chargeTypeId = data.chargeTasCodeDirect; 
   msg.header.equipmentNumber = eqId;
   msg.header.timeStamp = data.header.timeStamp;
-  msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill;
+  msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CatastrophicKill;
   msg.originatorId = data.originatorEquipmentNumber;
 
   DEBUG_LOG(m_logger) << "sending state change direct (kill) with jamming for eqId " << msg.header.equipmentNumber;
@@ -213,7 +213,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateC
   const auto &pData = m_dtcPpm->dynamicParticipantData(p);
   for (const auto &dyn : pData.stateHistory())
   {
-    if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
+    if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
     {
       return false;
     }

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp

@@ -235,7 +235,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
         msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::Initialisation;
         msg.tasVitality = 100;
         msg.vulnerabilityBits = 0;
-        msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady;
+        msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady;
 
         m_sendToDds->rxData(msg);