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

Migrates AreaEffectSimulation to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:07 +02:00
1 parent e8d07af320
commit 472f537313
102 files changed
+3307 -3313
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h
+14 -14
View File
@@ -57,7 +57,7 @@ protected:
bool isLockedTopic(int id)
{
AreaEffectSimulation::AesItem data;
data.id(id);
data.id = id;
int exId = m_mainHandler->dds()->ddsConnector()->getPartitionId();
return m_mainHandler->dds()->topicLockMaster()->isLocked<AreaEffectSimulation::AesItem>(data, exId);
}
@@ -187,30 +187,30 @@ public:
return Core::FunctionReplyObject(id, tr_lts("dds", "Effect simulation with id %1 not found.")).arg(id);
bool succ = false;
switch (effectState.underlying())
switch (effectState)
{
case AesEffectState_def::EsReceived:
case AesEffectState::EsReceived:
succ = ifs->trySwitchToReceived();
break;
case AesEffectState_def::EsCreated:
case AesEffectState::EsCreated:
succ = ifs->trySwitchToCreated();
break;
case AesEffectState_def::EsPrepared:
case AesEffectState::EsPrepared:
succ = ifs->trySwitchToPrepared();
break;
case AesEffectState_def::EsFired:
case AesEffectState::EsFired:
succ = ifs->trySwitchToFired();
break;
case AesEffectState_def::EsActivated:
case AesEffectState::EsActivated:
succ = !ifs->activateObjectNow().error();
break;
case AesEffectState_def::EsPaused:
case AesEffectState::EsPaused:
succ = ifs->trySwitchToPaused();
break;
case AesEffectState_def::EsExpired:
case AesEffectState::EsExpired:
succ = ifs->trySwitchToExpired();
break;
case AesEffectState_def::EsRemoved:
case AesEffectState::EsRemoved:
succ = ifs->trySwitchToRemoved();
break;
default:
@@ -218,14 +218,14 @@ public:
}
if (succ)
return Core::FunctionReplyObject();
return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(effectState.underlying());
return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(effectState);
}
Core::FunctionReplyObject aesItemRemove(const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "on" << m_typeName << "RemoveRequest: " << request;
int id = request.id();
int id = request.id;
Core::FunctionReplyObject ret;
Obj *ifs = getObjectFromMap(m_objectMap, id, ret);
@@ -242,11 +242,11 @@ public:
Core::FunctionReplyObject removeReply(bool (AreaEffectSimulation::DatabaseInterface::*dbRemoveMethod)(qint32), const Core::RemoveElementRequest &request)
{
if (request.id() >= 0)
if (request.id >= 0)
return aesItemRemove(request);
// else force = negative id
qint32 id = request.id() * -1;
qint32 id = request.id * -1;
Obj *ifs = m_objectMap.value(id);
if (ifs == nullptr)