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_relay_info.cpp

@@ -25,19 +25,19 @@ ObjectRelayInfo::ObjectRelayInfo(MainHandler *mainHandler)
 ObjectRelayInfo::~ObjectRelayInfo()
 {
   if (isValid())
-    m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id());
+    m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 bool ObjectRelayInfo::isValid() const
 {
-  return m_data.id() > 0;
+  return m_data.id > 0;
 }
 
 //------------------------------------------------------------------------------
 bool ObjectRelayInfo::isUsed() const
 {
-  return m_data.isUsed();
+  return m_data.isUsed;
 }
 
 //------------------------------------------------------------------------------
@@ -45,79 +45,79 @@ Core::FunctionReplyObject ObjectRelayInfo::createObject(const RelayInfo &data)
 {
   m_data = data;
 
-  if (m_data.id() < 0)
+  if (m_data.id < 0)
   {
-    m_data.isUsed(false);
+    m_data.isUsed = false;
 
     Database::AsmEgcuRelayInfo dbData(toDbData(data));
 
     if (!m_mainHandler->db()->insert(dbData))
       return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmEgcuRelayInfo-data into database"));
 
-    m_data.id(dbData.id);
-    DEBUG_LOG(m_logger) << "New relayInfo Id: " << m_data.id();
+    m_data.id = dbData.id;
+    DEBUG_LOG(m_logger) << "New relayInfo Id: " << m_data.id;
   }
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectRelayInfo::updateObject(const RelayInfo &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::AsmEgcuRelayInfo dbData;
   dbData = toDbData(data);
 
   if (!m_mainHandler->db()->update(dbData))
-    return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmEgcuRelayInfo-data into database"));
+    return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmEgcuRelayInfo-data into database"));
 
   m_data = data;
-  DEBUG_LOG(m_logger) << "Data changed for relayInfo Id: " << m_data.id();
+  DEBUG_LOG(m_logger) << "Data changed for relayInfo Id: " << m_data.id;
 
   // Publish Data via DTS
   onPublishData();
 
-  return Core::FunctionReplyObject(m_data.id());
+  return Core::FunctionReplyObject(m_data.id);
 }
 
 //------------------------------------------------------------------------------
 Core::FunctionReplyObject ObjectRelayInfo::setUsed(bool isUsed)
 {
   if (!isValid())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed AsmEgcuRelayInfo object"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed AsmEgcuRelayInfo 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 ObjectRelayInfo::removeObject()
 {
   if (isUsed())
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo still in use"));
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo still in use"));
 
-  if (!m_mainHandler->db()->removeAsmEgcuRelayInfo(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo with id %1 can not be removed from DB")).arg(m_data.id());
+  if (!m_mainHandler->db()->removeAsmEgcuRelayInfo(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo with id %1 can not be removed from DB")).arg(m_data.id);
 
-  if (!m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id()))
-    return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo with id %1 can not be removed from DDS")).arg(m_data.id());
+  if (!m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id))
+    return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo 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 ObjectRelayInfo::onPublishData()
 {
-  INFO_LOG(m_logger) << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id() << ") ...";
+  INFO_LOG(m_logger) << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id << ") ...";
 
   if (!m_mainHandler->dds()->dts()->publish(m_data))
     ERROR_LOG(m_logger) << "Error publishing AsmEgcuRelayInfo-data to dds";
@@ -132,11 +132,11 @@ Database::AsmEgcuRelayInfo ObjectRelayInfo::toDbData(const RelayInfo &ddsData)
 {
   Database::AsmEgcuRelayInfo dbData;
 
-  dbData.id          = ddsData.id();
-  dbData.relayId     = ddsData.id();
-  dbData.name        = QString::fromStdString(ddsData.name());
-  dbData.description = QString::fromStdString(ddsData.description());
-  dbData.properties  = QString::fromStdString(ddsData.property());
+  dbData.id          = ddsData.id;
+  dbData.relayId     = ddsData.id;
+  dbData.name        = QString::fromStdString(ddsData.name);
+  dbData.description = QString::fromStdString(ddsData.description);
+  dbData.properties  = QString::fromStdString(ddsData.property);
 
   return dbData;
 }
@@ -147,14 +147,14 @@ RelayInfo ObjectRelayInfo::toDdsData(const Database::AsmEgcuRelayInfo &dbData)
 {
   RelayInfo ddsData;
 
-  ddsData.id(dbData.relayId);
-  ddsData.name(dbData.name.toStdString());
-  ddsData.description(dbData.description.toStdString());
-  ddsData.property(dbData.properties.toStdString());
+  ddsData.id = dbData.relayId;
+  ddsData.name = dbData.name.toStdString();
+  ddsData.description = dbData.description.toStdString();
+  ddsData.property = dbData.properties.toStdString();
 
   // init data not in db
-  ddsData.isDeleted(false);
-  ddsData.isUsed(false);
+  ddsData.isDeleted = false;
+  ddsData.isUsed = false;
 
   return ddsData;
 }