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

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/handler_codification_data.cpp
+7 -7
View File
@@ -63,7 +63,7 @@ void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::S
const CodificationData &request)
{
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
auto ret = request.id > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
@@ -85,9 +85,9 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataCreateRequest
Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest(const CodificationData &request)
{
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification table with id %1 not found")).arg(request.id);
return ifs->updateObject(request);
} // end of onCodificationDataModifyRequest()
@@ -99,10 +99,10 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id);
if (ifs == nullptr)
{
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification table with id %1 not found")).arg(request.id);
ERROR_LOG(m_logger) << ret();
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
return;
@@ -110,7 +110,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
if (m_ddsHandler->topicLockMaster()->isLocked(ifs->getData(), m_ddsHandler->exerciseId()))
{
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification '%1' is used by another user!")).arg(ifs->getData().identifier());
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification '%1' is used by another user!")).arg(ifs->getData().identifier);
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
return;
}
@@ -122,7 +122,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
{
// delete codification object
delete ifs;
m_codificationdataObjMap.remove(request.id());
m_codificationdataObjMap.remove(request.id);
}
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.cpp
+49 -49
View File
@@ -22,7 +22,7 @@ ObjectCodificationData::ObjectCodificationData(const std::shared_ptr<DdsHandler>
ObjectCodificationData::~ObjectCodificationData()
{
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id);
} // end of dtor()
//-----------------------------------------------------------------------------
@@ -31,9 +31,9 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
DEBUG_LOG(m_logger) << "ObjectCodificationData::createObject()";
m_ddsData = ddsData;
if (m_ddsData.id() <= 0)
if (m_ddsData.id <= 0)
{
m_ddsData.isUsed(false);
m_ddsData.isUsed = false;
Database::CodCodificationTable dbData;
dbData = toDbData(ddsData);
@@ -41,14 +41,14 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
if (!m_dbHandler->db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting codification_table data into database"));
m_ddsData.id(dbData.id);
DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id();
m_ddsData.id = dbData.id;
DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id;
}
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_ddsData.id());
return Core::FunctionReplyObject(m_ddsData.id);
} // end of createObject()
//-----------------------------------------------------------------------------
@@ -57,22 +57,22 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
DEBUG_LOG(m_logger) << "ObjectCodificationData::updateObject()";
if (!isValid())
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(ddsData.id, tr_lts("dds", "Object not valid/blocked"));
// convert request ddsData -> dbData
Database::CodCodificationTable dbData;
dbData = toDbData(ddsData);
if (!m_dbHandler->db()->update(dbData))
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Error updating codification_table data in database"));
return Core::FunctionReplyObject(ddsData.id, tr_lts("dds", "Error updating codification_table data in database"));
// update internal objectdata
m_ddsData = ddsData;
DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id();
DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_ddsData.id());
return Core::FunctionReplyObject(m_ddsData.id);
} // end of updateObject()
//-----------------------------------------------------------------------------
@@ -82,21 +82,21 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
DEBUG_LOG(m_logger) << "ObjectCodificationData::removeObject()";
if (isUsed())
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table data still in use"));
return Core::FunctionReplyObject(m_ddsData.id, tr_lts("dds", "codification_table data still in use"));
if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id()))
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id());
if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id))
return Core::FunctionReplyObject(m_ddsData.id, tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id);
DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id();
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id;
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id);
return Core::FunctionReplyObject(m_ddsData.id());
return Core::FunctionReplyObject(m_ddsData.id);
} // end of removeObject()
//-----------------------------------------------------------------------------
void ObjectCodificationData::onPublishData()
{
INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id << ") ...";
if (!m_ddsHandler->dts()->publish(m_ddsData))
ERROR_LOG(m_logger) << "Error publishing CodificationData data to dds";
@@ -105,13 +105,13 @@ void ObjectCodificationData::onPublishData()
bool ObjectCodificationData::isValid() const
{
return m_ddsData.id() > 0;
return m_ddsData.id > 0;
} // end of isValid()
//-----------------------------------------------------------------------------
bool ObjectCodificationData::isUsed() const
{
return m_ddsData.isUsed();
return m_ddsData.isUsed;
} // end of isUsed()
//-----------------------------------------------------------------------------
@@ -120,24 +120,24 @@ CodificationManagement::CodificationData ObjectCodificationData::toDdsData(const
{
CodificationManagement::CodificationData ddsData;
ddsData.id(dbData.id);
ddsData.numeralCodeTableColumnIndex(dbData.numeralCodeTableColumnIndex.toStdString());
ddsData.numeralCodeTableRowIndex(dbData.numeralCodeTableRowIndex.toStdString());
ddsData.authenticationTableColumnIndex(dbData.authenticationTableColumnIndex.toStdString());
ddsData.authenticationTableRowIndex(dbData.authenticationTableRowIndex.toStdString());
ddsData.authenticationTableMatirx(dbData.authenticationTableMatirx.toStdString());
ddsData.logisticalTermTableColumnIndex(dbData.logisticalTermTableColumnIndex.toStdString());
ddsData.logisticalTermTableRowIndex(dbData.logisticalTermTableRowIndex.toStdString());
ddsData.logisticalTermTableMatrix(dbData.logisticalTermTableMatrix.toStdString());
ddsData.phraseTable(dbData.phraseTable.toStdString());
ddsData.note(dbData.note.toStdString());
ddsData.identifier(dbData.identifier.toStdString()),
ddsData.validityTime(dbData.validityTime);
ddsData.partyId(dbData.partyId);
ddsData.id = dbData.id;
ddsData.numeralCodeTableColumnIndex = dbData.numeralCodeTableColumnIndex.toStdString();
ddsData.numeralCodeTableRowIndex = dbData.numeralCodeTableRowIndex.toStdString();
ddsData.authenticationTableColumnIndex = dbData.authenticationTableColumnIndex.toStdString();
ddsData.authenticationTableRowIndex = dbData.authenticationTableRowIndex.toStdString();
ddsData.authenticationTableMatirx = dbData.authenticationTableMatirx.toStdString();
ddsData.logisticalTermTableColumnIndex = dbData.logisticalTermTableColumnIndex.toStdString();
ddsData.logisticalTermTableRowIndex = dbData.logisticalTermTableRowIndex.toStdString();
ddsData.logisticalTermTableMatrix = dbData.logisticalTermTableMatrix.toStdString();
ddsData.phraseTable = dbData.phraseTable.toStdString();
ddsData.note = dbData.note.toStdString();
ddsData.identifier = dbData.identifier.toStdString(),
ddsData.validityTime = dbData.validityTime;
ddsData.partyId = dbData.partyId;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
} // end of toDdsData()
@@ -147,20 +147,20 @@ Database::CodCodificationTable ObjectCodificationData::toDbData(const Codificati
{
Database::CodCodificationTable dbData;
dbData.id = ddsData.id();
dbData.numeralCodeTableColumnIndex = QString::fromStdString(ddsData.numeralCodeTableColumnIndex());
dbData.numeralCodeTableRowIndex = QString::fromStdString(ddsData.numeralCodeTableRowIndex());
dbData.authenticationTableColumnIndex = QString::fromStdString(ddsData.authenticationTableColumnIndex());
dbData.authenticationTableRowIndex = QString::fromStdString(ddsData.authenticationTableRowIndex());
dbData.authenticationTableMatirx = QString::fromStdString(ddsData.authenticationTableMatirx());
dbData.logisticalTermTableColumnIndex = QString::fromStdString(ddsData.logisticalTermTableColumnIndex());
dbData.logisticalTermTableRowIndex = QString::fromStdString(ddsData.logisticalTermTableRowIndex());
dbData.logisticalTermTableMatrix = QString::fromStdString(ddsData.logisticalTermTableMatrix());
dbData.phraseTable = QString::fromStdString(ddsData.phraseTable());
dbData.note = QString::fromStdString(ddsData.note());
dbData.identifier = QString::fromStdString(ddsData.identifier());
dbData.validityTime = ddsData.validityTime();
dbData.partyId = ddsData.partyId();
dbData.id = ddsData.id;
dbData.numeralCodeTableColumnIndex = QString::fromStdString(ddsData.numeralCodeTableColumnIndex);
dbData.numeralCodeTableRowIndex = QString::fromStdString(ddsData.numeralCodeTableRowIndex);
dbData.authenticationTableColumnIndex = QString::fromStdString(ddsData.authenticationTableColumnIndex);
dbData.authenticationTableRowIndex = QString::fromStdString(ddsData.authenticationTableRowIndex);
dbData.authenticationTableMatirx = QString::fromStdString(ddsData.authenticationTableMatirx);
dbData.logisticalTermTableColumnIndex = QString::fromStdString(ddsData.logisticalTermTableColumnIndex);
dbData.logisticalTermTableRowIndex = QString::fromStdString(ddsData.logisticalTermTableRowIndex);
dbData.logisticalTermTableMatrix = QString::fromStdString(ddsData.logisticalTermTableMatrix);
dbData.phraseTable = QString::fromStdString(ddsData.phraseTable);
dbData.note = QString::fromStdString(ddsData.note);
dbData.identifier = QString::fromStdString(ddsData.identifier);
dbData.validityTime = ddsData.validityTime;
dbData.partyId = ddsData.partyId;
return dbData;
} // end of toDbData()
qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/object_codification_data.h
+2 -2
View File
@@ -28,8 +28,8 @@ public:
Core::FunctionReplyObject updateObject(const CodificationManagement::CodificationData &ddsData);
Core::FunctionReplyObject removeObject();
qint32 getId() const { return m_ddsData.id(); }
QString getName() const { return QString::fromStdString(m_ddsData.name()); }
qint32 getId() const { return m_ddsData.id; }
QString getName() const { return QString::fromStdString(m_ddsData.name); }
const CodificationData &getData() const { return m_ddsData; }
bool isValid() const;