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

Migrates Participant and OperatorManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access in ppm and opm services and plugins.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:44 +02:00
1 parent bdb2461737
commit 95071993f5
36 files changed
+513 -529
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp
+21 -21
View File
@@ -125,13 +125,13 @@ void HandlerLockedTopics::onTryLockEntityRequest(const rti::core::SampleIdentity
dumpLockedTopics(__LINE__);
auto ret = tryLock(request);
if (!ret.errorString().empty())
if (!ret.errorString.empty())
{
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString, ret.errorParams).translated() << " - " << request;
}
else if (ret.alreadyLocked())
else if (ret.alreadyLocked)
{
WARNING_LOG(m_logger) << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked().get().workstationName() << " and op " << ret.alreadyLocked().get().operatorName() << " - " << request;
WARNING_LOG(m_logger) << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked.get().workstationName << " and op " << ret.alreadyLocked.get().operatorName << " - " << request;
}
m_ftsTryLockEntity->sendReply(cookie, ret);
@@ -158,9 +158,9 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
{
DEBUG_LOG(m_logger) << "tryLock : " << request;
const auto topicId = request.entityId();
const auto topicId = request.entityId;
const Core::key k(request.entityId(), request.exerciseId(), QString::fromStdString(request.entityTypeName()));
const Core::key k(request.entityId, request.exerciseId, QString::fromStdString(request.entityTypeName));
Database::OpmLockedTopics dbStruct(toDb(request));
auto it = m_lockedTopics.constFind(k);
if (it == m_lockedTopics.constEnd())
@@ -173,9 +173,9 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
}
m_lockedTopics.insert(k, dbStruct);
Core::LockedEntity lckEntity(request.operatorId(), request.workstationId(),
request.exerciseId(), request.entityId(),
request.entityTypeName(), dbStruct.id);
Core::LockedEntity lckEntity(request.operatorId, request.workstationId,
request.exerciseId, request.entityId,
request.entityTypeName, dbStruct.id);
publishLockedEntity(lckEntity);
return lockSuccessReply(dbStruct);
}
@@ -185,7 +185,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
// already locked by another user
const Database::OpmLockedTopics &data = *it;
const auto opName = m_mainHandler.getHandlerOperator()->operatorNameById(data.operatorId);
const auto wsName = m_mainHandler.dds()->dtcAsm()->asset(data.workstationId).name();
const auto wsName = m_mainHandler.dds()->dtcAsm()->asset(data.workstationId).name;
return lockAlreadyLockedReply(wsName, opName);
}
@@ -304,9 +304,9 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti
dumpLockedTopics(__LINE__);
auto ret = tryUnlock(request);
if (!ret.errorString().empty())
if (!ret.errorString.empty())
{
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString, ret.errorParams).translated() << " - " << request;
}
m_ftsTryUnlockEntity->sendReply(cookie, ret);
@@ -318,7 +318,7 @@ Core::FunctionReply HandlerLockedTopics::tryUnlock(const Core::TryUnlockEntityRe
{
DEBUG_LOG(m_logger) << "tryUnlock: " << request;
const auto lockEntityId = request.id();
const auto lockEntityId = request.id;
auto lockedTopicIt = std::find_if(m_lockedTopics.constBegin(), m_lockedTopics.constEnd(),
[lockEntityId](const Database::OpmLockedTopics &lockedTopic)
@@ -352,11 +352,11 @@ Database::OpmLockedTopics HandlerLockedTopics::toDb(const Core::LockedEntityBase
{
Database::OpmLockedTopics ret;
ret.locked = true;
ret.entityId = request.entityId();
ret.entityTypeName = QString::fromStdString(request.entityTypeName());
ret.operatorId = request.operatorId();
ret.workstationId = request.workstationId();
ret.exerciseId = request.exerciseId() ? QVariant(request.exerciseId()) : QVariant();
ret.entityId = request.entityId;
ret.entityTypeName = QString::fromStdString(request.entityTypeName);
ret.operatorId = request.operatorId;
ret.workstationId = request.workstationId;
ret.exerciseId = request.exerciseId ? QVariant(request.exerciseId) : QVariant();
return ret;
}
@@ -367,20 +367,20 @@ bool HandlerLockedTopics::publishLockedEntity(const Core::LockedEntity &entity)
m_dtsLockedEntity->write(entity);
return true;
}
ERROR_LOG(m_logger) << "Publishing LockedEntity " << entity.id() << " failed: DTS not available!";
ERROR_LOG(m_logger) << "Publishing LockedEntity " << entity.id << " failed: DTS not available!";
return false;
}
bool HandlerLockedTopics::removeLockedEntity(int64_t id)
{
Core::LockedEntity entity;
entity.id(id);
entity.id = id;
if (m_dtsLockedEntity)
{
m_dtsLockedEntity->remove(entity);
return true;
}
ERROR_LOG(m_logger) << "Removing LockedEntity " << entity.id() << " failed: DTS not available!";
ERROR_LOG(m_logger) << "Removing LockedEntity " << entity.id << " failed: DTS not available!";
return false;
}