Migrates OcSituation and ServiceManagement to generated rtiddsgen API

Converts accessor calls to plain member access in osc, oss and obd services.

qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp

@@ -144,19 +144,19 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
   uint64_t tmp;
   int x = 0, y = 0;
 
-  req.chargeTypeId(311); // danger area
+  req.chargeTypeId = 311; // danger area
 
   for (int i = 0; i < cnt; ++i)
   {
     LtsUtils::get2Byte(data, pos, tmp);
-    req.id(tmp);
-    req.name(data.mid(pos, 8).toStdString());
+    req.id = tmp;
+    req.name = data.mid(pos, 8).toStdString();
     pos += 8;
     LtsUtils::get4Byte(data, pos, tmp);
     if (tmp > 0)
-      req.effectStart(dds::core::optional<rti::core::int64>(tmp * 1000));
+      req.effectStart = dds::core::optional<rti::core::int64>(tmp * 1000);
     else
-      req.effectStart(dds::core::optional<rti::core::int64>());
+      req.effectStart = dds::core::optional<rti::core::int64>();
 
     size_t segmentCnt = 0;
     LtsUtils::get1Byte(data, pos, segmentCnt);
@@ -168,20 +168,20 @@ void HandlerOcAesData::handleDangerAreas(const QByteArray &data, size_t pos)
       LtsUtils::get3Byte(data, pos, x);
       segments.emplace_back(relativeFromGeoPosition(x, y));
     }
-    req.segments(segments);
+    req.segments = segments;
 
-    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "danger area: " << req;
+    DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id) ? "Modifying " : "Creating ") << "danger area: " << req;
 
-    aesToBeDeleted.removeAll(req.id()); // item was created/modified -> does not need to be deleted
-    req.id(req.id() * -1); // inverted id to mark as for oc
+    aesToBeDeleted.removeAll(req.id); // item was created/modified -> does not need to be deleted
+    req.id = req.id * -1; // inverted id to mark as for oc
     m_aesFtc->dangerAreaModifyRequest(req, this);
   }
 
   for (int id : qAsConst(aesToBeDeleted))
   {
-    if (m_aesDtc->dangerArea(id).isCentral())
+    if (m_aesDtc->dangerArea(id).isCentral)
       continue;
-    if (m_aesDtc->dangerArea(id).effectStateId().underlying() > AreaEffectSimulation::AesEffectState::EsRemoved)
+    if (m_aesDtc->dangerArea(id).effectStateId > AreaEffectSimulation::AesEffectState::EsRemoved)
     {
       DEBUG_LOG(m_logger) << "Removing danger area id: " << id;
       m_aesFtc->dangerAreaRemoveRequest(Core::RemoveElementRequest(id), this);
@@ -201,28 +201,28 @@ void HandlerOcAesData::handleIeds(const QByteArray &data, size_t pos)
   unsigned long tmp;
   int x = 0, y = 0;
 
-  def.pairingState(1); // not paired in OC application
+  def.pairingState = 1; // not paired in OC application
 
   for (int i = 0; i < cnt; ++i)
   {
     LtsUtils::get2Byte(data, pos, tmp);
-    def.iedId(tmp);
+    def.iedId = tmp;
     LtsUtils::get1Byte(data, pos, tmp);
-    def.type(tmp);
+    def.type = tmp;
     LtsUtils::get1Byte(data, pos, tmp);
-    def.tautWireTrigger((tmp >> 3) & 0x01);
-    def.lightBarrierTrigger((tmp >> 2) & 0x01);
-    def.switchTrigger((tmp >> 1) & 0x01);
-    def.remoteTrigger((tmp >> 0) & 0x01);
+    def.tautWireTrigger = (tmp >> 3) & 0x01;
+    def.lightBarrierTrigger = (tmp >> 2) & 0x01;
+    def.switchTrigger = (tmp >> 1) & 0x01;
+    def.remoteTrigger = (tmp >> 0) & 0x01;
     LtsUtils::get1Byte(data, pos, tmp);
-    def.explosiveForce(tmp);
+    def.explosiveForce = tmp;
     LtsUtils::get1Byte(data, pos, tmp);
-    def.partyId(tmp);
+    def.partyId = tmp;
     LtsUtils::get1Byte(data, pos, tmp);
-    def.tacticalState(tmp);
+    def.tacticalState = tmp;
     LtsUtils::get3Byte(data, pos, x);
     LtsUtils::get3Byte(data, pos, y);
-    def.position(relativeFromGeoPosition(x, y));
+    def.position = relativeFromGeoPosition(x, y);
 
     DEBUG_LOG(m_logger) << "Publishing definition ied: " << def;
 
@@ -242,7 +242,7 @@ void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
   QMap<int, int> IedEqNumberToDdsId; // iedEqNumber, ddsId
 
   for (const auto &ied : ieds)
-    IedEqNumberToDdsId.insert(ied.equipmentNumber(), ied.id());
+    IedEqNumberToDdsId.insert(ied.equipmentNumber, ied.id);
 
   TrainingAreaBase::DefinitionIed def;
   unsigned long eqNumber;
@@ -252,18 +252,18 @@ void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos)
   {
     LtsUtils::get2Byte(data, pos, eqNumber);
     const GuezIedManagement::Ied &ied = ieds.value(IedEqNumberToDdsId.value(eqNumber));
-    def.iedId(eqNumber);
-    def.type(ied.type().underlying());
-    def.tautWireTrigger(ied.tautWireTrigger());
-    def.lightBarrierTrigger(ied.lightBarrierTrigger());
-    def.switchTrigger(ied.switchTrigger());
-    def.remoteTrigger(ied.remoteTrigger());
-    def.explosiveForce(ied.explosiveForce());
-    def.partyId(ied.partyId());
-    def.tacticalState(ied.tacticalState().underlying());
+    def.iedId = eqNumber;
+    def.type = ied.type;
+    def.tautWireTrigger = ied.tautWireTrigger;
+    def.lightBarrierTrigger = ied.lightBarrierTrigger;
+    def.switchTrigger = ied.switchTrigger;
+    def.remoteTrigger = ied.remoteTrigger;
+    def.explosiveForce = ied.explosiveForce;
+    def.partyId = ied.partyId;
+    def.tacticalState = ied.tacticalState;
     LtsUtils::get3Byte(data, pos, x);
     LtsUtils::get3Byte(data, pos, y);
-    def.position(relativeFromGeoPosition(x, y));
+    def.position = relativeFromGeoPosition(x, y);
 
     m_tabDts->publish(def);
   }
@@ -278,11 +278,11 @@ Core::GeoPosition2D HandlerOcAesData::relativeFromGeoPosition(int x, int y)
 void HandlerOcAesData::onSpecificsExerciseChanged(const TrainingAreaBaseOC::SpecificsExercise &data, DataModification mod)
 {
   if (mod == DataModification::eAdded || mod == DataModification::eModified)
-    m_utmCoord = LtsCoordTrans::UtmCoordinate::fromMgrs(QString::number(data.zone()) +
-                                                        QLatin1Char(data.band()) +
-                                                        QString::fromStdString(data.square()) +
-                                                        QString::number(data.northing()).rightJustified(7, QLatin1Char('0')) +
-                                                        QString::number(data.easting()).rightJustified(7, QLatin1Char('0')));
+    m_utmCoord = LtsCoordTrans::UtmCoordinate::fromMgrs(QString::number(data.zone) +
+                                                        QLatin1Char(data.band) +
+                                                        QString::fromStdString(data.square) +
+                                                        QString::number(data.northing).rightJustified(7, QLatin1Char('0')) +
+                                                        QString::number(data.easting).rightJustified(7, QLatin1Char('0')));
 }
 
 } // namespace OcSituationClient