Migrates AreaEffectSimulation to generated rtiddsgen API

Converts accessor calls to plain member access across aes service and plugin.

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

@@ -12,7 +12,7 @@ namespace AreaEffectSimulation
 {
 
 HandlerOffRouteMine::HandlerOffRouteMine(MainHandler *mainHandler)
-  : HandlerBaseTmpl<ObjectOffRouteMine>(mainHandler, QStringLiteral("OffRouteMine"), s_areaCount[AesType::AtOffRouteMine], s_areaCountCentral[AesType::AtOffRouteMine])
+  : HandlerBaseTmpl<ObjectOffRouteMine>(mainHandler, QStringLiteral("OffRouteMine"), s_areaCount[static_cast<int>(AesType::AtOffRouteMine)], s_areaCountCentral[static_cast<int>(AesType::AtOffRouteMine)])
   , Interface::Fts::OffRouteMineModifyRequestHandler(mainHandler->dds()->fts())
   , Interface::Fts::OffRouteMineRemoveRequestHandler(mainHandler->dds()->fts())
   , Interface::Fts::OffRouteMineTriggerRequestHandler(mainHandler->dds()->fts())
@@ -33,7 +33,7 @@ bool HandlerOffRouteMine::init()
       bRet = false;
       return;
     }
-    if (totalAreasCentral() >= s_maxActiveAreasCentral[AesType::AtOffRouteMine])
+    if (totalAreasCentral() >= s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)])
     {
       ERROR_LOG(m_logger) << "More active off route mines in database than allowed - ignoring the rest!";
       ifs->removeObject();
@@ -62,34 +62,34 @@ bool HandlerOffRouteMine::init()
 
 int HandlerOffRouteMine::totalAreas() const
 {
-  return s_areaCount[AesType::AtOffRouteMine];
+  return s_areaCount[static_cast<int>(AesType::AtOffRouteMine)];
 }
 
 int HandlerOffRouteMine::totalAreasCentral() const
 {
-  return s_areaCountCentral[AesType::AtOffRouteMine];
+  return s_areaCountCentral[static_cast<int>(AesType::AtOffRouteMine)];
 }
 
 static void fillData(const OffRouteMineModifyRequest &src, Database::AesOffRouteMine &dst)
 {
-  if (src.id() < 0) // is the id given as negative? set id -> used by OC-laptop
-    dst.id = src.id();
+  if (src.id < 0) // is the id given as negative? set id -> used by OC-laptop
+    dst.id = src.id;
 
-  dst.name = QString::fromStdString(src.name());
-  dst.effectStart = src.effectStart().is_set() && src.effectStart().get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart().get()) : QDateTime();
-  dst.effectDuration = src.effectDuration();
-  dst.impactPosition.rx() = src.area().cornerBottomLeft().lon();
-  dst.impactPosition.ry() = src.area().cornerBottomLeft().lat();
-  dst.width = src.area().width();
-  dst.length = src.area().height();
-  dst.rotationAngle = src.area().rotation();
-  dst.impactRadius = src.impactRadius().is_set() ? src.impactRadius().get() : 0;
-  dst.partyId = src.partyId().is_set() ? src.partyId().get() : 0;
-  dst.chargeTypeId = src.chargeTypeId();
+  dst.name = QString::fromStdString(src.name);
+  dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
+  dst.effectDuration = src.effectDuration;
+  dst.impactPosition.rx() = src.area.cornerBottomLeft.lon;
+  dst.impactPosition.ry() = src.area.cornerBottomLeft.lat;
+  dst.width = src.area.width;
+  dst.length = src.area.height;
+  dst.rotationAngle = src.area.rotation;
+  dst.impactRadius = src.impactRadius.is_set() ? src.impactRadius.get() : 0;
+  dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
+  dst.chargeTypeId = src.chargeTypeId;
   dst.isCentral = true;
   dst.triggered = false;
-  //dst.participantId = src.participantId().is_set() ? src.participantId().get() : 0;
-  //dst.externalId = src.externalId().is_set() ? src.externalId().get() : 0;
+  //dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
+  //dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
 
 }
 
@@ -105,7 +105,7 @@ void HandlerOffRouteMine::onOffRouteMineModifyRequest(const rti::core::SampleIde
 
 Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineCreateRequest(const OffRouteMineModifyRequest &request)
 {
-  if (totalAreasCentral() >= (s_maxActiveAreasCentral[AesType::AtOffRouteMine]) && request.effectStart().is_set())
+  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)]) && request.effectStart.is_set())
     return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active off route mines."));
 
   Database::AesOffRouteMine newData;
@@ -135,15 +135,15 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
 {
   Core::FunctionReplyObject ret;
   ObjectOffRouteMine *ifs = nullptr;
-  if (request.id() == 0 || ((request.id() < 0) && !getObjectFromMap(m_objectMap, std::abs(request.id()), ret)))
+  if (request.id == 0 || ((request.id < 0) && !getObjectFromMap(m_objectMap, std::abs(request.id), ret)))
     return offRouteMineCreateRequest(request);
 
-  ifs = getObjectFromMap(m_objectMap, std::abs(request.id()), ret);
+  ifs = getObjectFromMap(m_objectMap, std::abs(request.id), ret);
 
   if (!ifs)
     return ret;
 
-  if (request.effectStart().is_set() && (request.effectStart().get() + request.effectDuration() < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
+  if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
     return removeObject(ifs);
 
   // Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
@@ -151,16 +151,16 @@ Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineModifyRequest(const O
   /*!
    *  If the effect start added after creation, the max amount need to be checked
   !*/
-  if (totalAreasCentral() >= (s_maxActiveAreasCentral[AesType::AtOffRouteMine])
-      && request.effectStart().is_set()
+  if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtOffRouteMine)])
+      && request.effectStart.is_set()
       && !ifs->isActivationTimeSet() // check if time before change was not setted.
       /*&& !ifs->isObjectModifiable()*/)
   {
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Too many active off route mines."));
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active off route mines."));
   }
   Database::AesOffRouteMine aea(ifs->data());
   fillData(request, aea);
-  if (request.id() < 0 && checkStateForSfm(ifs))
+  if (request.id < 0 && checkStateForSfm(ifs))
   {
     DEBUG_LOG(m_logger) << "Overwrite off route mine Effect State for OC";
     aea.effectStateId = AesEffectState::EsPrepared;
@@ -187,15 +187,15 @@ void HandlerOffRouteMine::onOffRouteMineTriggerRequest(const rti::core::SampleId
 Core::FunctionReplyObject HandlerOffRouteMine::offRouteMineTriggerRequest(const OffRouteMineTriggerRequest &request)
 {
   Core::FunctionReplyObject ret;
-  ObjectOffRouteMine *ifs = getObjectFromMap(m_objectMap, std::abs(request.id()), ret);
+  ObjectOffRouteMine *ifs = getObjectFromMap(m_objectMap, std::abs(request.id), ret);
 
   if (!ifs)
     return ret;
 
   Database::AesOffRouteMine aea(ifs->data());
   DEBUG_LOG(m_logger) << "Overwrite off route mine Effect State ";
-  aea.effectStateId = AesEffectState_def::EsExpired;
-  aea.triggered     = request.triggered();
+  aea.effectStateId = AesEffectState::EsExpired;
+  aea.triggered     = request.triggered;
   aea.effectDuration = aea.effectStart.msecsTo(QDateTime::currentDateTimeUtc());
   if (aea.effectDuration < 0)
     aea.effectDuration = 1;