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/MarkerManagement/handler_marker.cpp
+11 -11
View File
@@ -53,8 +53,8 @@ bool HandlerMarker::init()
// TODO: select descBymarkerId
for (const Database::MrkMarkerDescription &desc : qAsConst(dataDescriptionVec))
{
if (desc.markerId == ddsMoData.id())
ddsMoData.descriptions().push_back(ObjectMarker::toDdsData(desc));
if (desc.markerId == ddsMoData.id)
ddsMoData.descriptions.push_back(ObjectMarker::toDdsData(desc));
}
ObjectMarker *ifs(new ObjectMarker(m_ddsHandler, m_db));
@@ -91,7 +91,7 @@ void HandlerMarker::onMarkerModifyRequest(const rti::core::SampleIdentity &cooki
const Marker &request)
{
DEBUG_LOG(m_logger) << "MarkerModifyRequest: " << request;
auto ret = request.id() > 0 ? markerModifyRequest(request) : markerCreateRequest(request);
auto ret = request.id > 0 ? markerModifyRequest(request) : markerCreateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->markerModifyReply(cookie, ret);
@@ -120,10 +120,10 @@ Core::FunctionReplyObject HandlerMarker::markerCreateRequest(const Marker &reque
Core::FunctionReplyObject HandlerMarker::markerModifyRequest(const Marker &request)
{
ObjectMarker *ifs = m_objectMarkerMap.value(request.id());
ObjectMarker *ifs = m_objectMarkerMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(),
tr_lts("dds", "Marker with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id,
tr_lts("dds", "Marker with id %1 not found")).arg(request.id);
return ifs->updateObject(request);
} // end of markerModifyRequest()
@@ -142,13 +142,13 @@ void HandlerMarker::onMarkerRemoveRequest(const rti::core::SampleIdentity &cooki
Core::FunctionReplyObject HandlerMarker::markerRemoveRequest(const Core::RemoveElementRequest &request)
{
ObjectMarker *ifs = m_objectMarkerMap.value(request.id());
ObjectMarker *ifs = m_objectMarkerMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(),
tr_lts("dds", "Marker with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id,
tr_lts("dds", "Marker with id %1 not found")).arg(request.id);
if (m_ddsHandler->topicLockMaster()->isLocked(ifs->getData(), m_ddsHandler->ddsConnector()->getPartitionId()))
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Marker '%1' is used by another user!")).arg(ifs->getName());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Marker '%1' is used by another user!")).arg(ifs->getName());
const Core::FunctionReplyObject ret = ifs->removeObject();
@@ -157,7 +157,7 @@ Core::FunctionReplyObject HandlerMarker::markerRemoveRequest(const Core::RemoveE
// delete ObjectMarker
delete ifs;
m_objectMarkerMap.remove(request.id());
m_objectMarkerMap.remove(request.id);
return ret;
} // end of onMarkerRemoveRequest()