lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates EffectShow and AssetManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:24 +02:00
1 parent a09979afdd
commit bdb2461737
39 files changed
+818 -818
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.cpp
+34 -34
View File
@@ -21,16 +21,16 @@ ObjectMapDescription::ObjectMapDescription(MainHandler *mainHandler)
bool ObjectMapDescription::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
Core::FunctionReplyObject ObjectMapDescription::createObject(const MapDescription &data, int order)
{
m_data = data;
if (m_data.id() <= 0)
if (m_data.id <= 0)
{
m_data.isUsed(false);
m_data.isUsed = false;
Database::AsmMapDescription dbData(toDbData(data));
dbData.objOrder = order;
@@ -38,44 +38,44 @@ Core::FunctionReplyObject ObjectMapDescription::createObject(const MapDescriptio
if (!m_mainHandler->db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmMapDescription-data into database"));
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New MapDescription Id: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New MapDescription Id: " << m_data.id;
}
else if (order != m_order && m_order >= 0)
{
Database::AsmMapDescription dbData(toDbData(data));
dbData.objOrder = m_order;
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmMapDescription-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmMapDescription-data into database"));
}
m_order = order;
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectMapDescription::updateObject(const MapDescription &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::AsmMapDescription dbData(toDbData(data));
dbData.objOrder = m_order;
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmMapDescription-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmMapDescription-data into database"));
m_data = data;
DEBUG_LOG(m_logger) << "Data changed for MapDescription Id: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for MapDescription Id: " << m_data.id;
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectMapDescription::removeObject()
{
if (!m_mainHandler->db()->removeAsmMapDescription(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "MapDescription with id %1 can not be removed")).arg(m_data.id());
if (!m_mainHandler->db()->removeAsmMapDescription(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "MapDescription with id %1 can not be removed")).arg(m_data.id);
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
// -------------------------------------------------------------------------------------------------------
@@ -87,15 +87,15 @@ Database::AsmMapDescription ObjectMapDescription::toDbData(const MapDescription
{
Database::AsmMapDescription dbData;
dbData.id = ddsData.id();
dbData.name = QString::fromStdString(ddsData.name());
dbData.description = QString::fromStdString(ddsData.description());
dbData.trainingAreaId = ddsData.trainingAreaId();
dbData.mapTypeId = ddsData.mapTypeId();
dbData.mapDescriptionTypeId = ddsData.mapDescriptionTypeId();
dbData.url = QString::fromStdString(ddsData.url());
dbData.minScale = ddsData.minScale();
dbData.maxScale = ddsData.maxScale();
dbData.id = ddsData.id;
dbData.name = QString::fromStdString(ddsData.name);
dbData.description = QString::fromStdString(ddsData.description);
dbData.trainingAreaId = ddsData.trainingAreaId;
dbData.mapTypeId = ddsData.mapTypeId;
dbData.mapDescriptionTypeId = ddsData.mapDescriptionTypeId;
dbData.url = QString::fromStdString(ddsData.url);
dbData.minScale = ddsData.minScale;
dbData.maxScale = ddsData.maxScale;
return dbData;
}
@@ -106,19 +106,19 @@ MapDescription ObjectMapDescription::toDdsData(const Database::AsmMapDescription
{
MapDescription ddsData;
ddsData.id(dbData.id);
ddsData.name(dbData.name.toStdString());
ddsData.description(dbData.description.toStdString());
ddsData.trainingAreaId(dbData.trainingAreaId);
ddsData.mapTypeId(dbData.mapTypeId);
ddsData.mapDescriptionTypeId(dbData.mapDescriptionTypeId);
ddsData.url(dbData.url.toStdString());
ddsData.minScale(dbData.minScale);
ddsData.maxScale(dbData.maxScale);
ddsData.id = dbData.id;
ddsData.name = dbData.name.toStdString();
ddsData.description = dbData.description.toStdString();
ddsData.trainingAreaId = dbData.trainingAreaId;
ddsData.mapTypeId = dbData.mapTypeId;
ddsData.mapDescriptionTypeId = dbData.mapDescriptionTypeId;
ddsData.url = dbData.url.toStdString();
ddsData.minScale = dbData.minScale;
ddsData.maxScale = dbData.maxScale;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
}