Migrates EffectShow and AssetManagement to generated rtiddsgen API

Converts accessor calls to plain member access across esc and asm services.

qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.cpp

@@ -24,19 +24,19 @@ ObjectTrainingArea::ObjectTrainingArea(MainHandler *mainHandler)
 ObjectTrainingArea::~ObjectTrainingArea()
 {
   if (isValid())
-    m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id());
+    m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 bool ObjectTrainingArea::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
 bool ObjectTrainingArea::isUsed() const
 {
-  return m_data.isUsed();
+  return m_data.isUsed;
 }
 
 //------------------------------------------------------------------------------
@@ -44,79 +44,79 @@ Core::FunctionReplyObject ObjectTrainingArea::createObject(const TrainingArea &d
 {
   m_data = data;
 
-  if (m_data.id() <= 0)
+  if (m_data.id <= 0)
   {
-    m_data.isUsed(false);
+    m_data.isUsed = false;
 
     Database::AsmTrainingArea dbData(toDbData(data));
 
     if (!m_mainHandler->db()->insert(dbData))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmTrainingArea-data into database"));
 
-    m_data.id(dbData.id);
-    DEBUG_LOG(m_logger) << "New mapId: " << m_data.id();
+    m_data.id = dbData.id;
+    DEBUG_LOG(m_logger) << "New mapId: " << m_data.id;
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTrainingArea::updateObject(const TrainingArea &data)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
 
   Database::AsmTrainingArea dbData;
   dbData = toDbData(data);
 
   if (!m_mainHandler->db()->update(dbData))
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmTrainingArea-data into database"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmTrainingArea-data into database"));
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for mapId: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for mapId: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTrainingArea::setUsed(bool isUsed)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed AsmTrainingArea object"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed AsmTrainingArea object"));
 
-  m_data.isUsed(isUsed);
+  m_data.isUsed = isUsed;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectTrainingArea::removeObject()
 {
   if (isUsed())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea still in use"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea still in use"));
 
-  if (!m_mainHandler->db()->removeAsmTrainingArea(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removeAsmTrainingArea(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea with id %1 can not be removed from DDS")).arg(m_data.id);
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 void ObjectTrainingArea::onPublishData()
 {
-  INFO_LOG(m_logger) << "Publish AsmTrainingArea-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AsmTrainingArea-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing AsmTrainingArea-data to dds";
@@ -131,13 +131,13 @@ Database::AsmTrainingArea ObjectTrainingArea::toDbData(const TrainingArea &ddsDa
 {
   Database::AsmTrainingArea dbData;
 
-  dbData.id         = ddsData.id();
-  dbData.name       = QString::fromStdString(ddsData.name());
-  dbData.bottomLeft = QPointF(ddsData.bottomLeft().lon(), ddsData.bottomLeft().lat());
-  dbData.height     = ddsData.height();
-  dbData.width      = ddsData.width();
+  dbData.id         = ddsData.id;
+  dbData.name       = QString::fromStdString(ddsData.name);
+  dbData.bottomLeft = QPointF(ddsData.bottomLeft.lon, ddsData.bottomLeft.lat);
+  dbData.height     = ddsData.height;
+  dbData.width      = ddsData.width;
 
-  dbData.image      = QByteArray::fromRawData(reinterpret_cast<const char *>(&ddsData.image()[0]), ddsData.image().size());
+  dbData.image      = QByteArray::fromRawData(reinterpret_cast<const char *>(&ddsData.image[0]), ddsData.image.size());
 
   return dbData;
 }