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/ExerciseManagement/handler_exercise_phase.cpp
+20 -20
View File
@@ -69,11 +69,11 @@ Core::FunctionReplyObject HandlerExercisePhase::exercisePhaseCreateRequest(const
{
Database::ExmExercisePhase newData;
newData.name = QString::fromStdString(request.name());
newData.description = QString::fromStdString(request.description());
newData.beginTime = QDateTime::fromMSecsSinceEpoch(request.beginTime());
newData.endTime = QDateTime::fromMSecsSinceEpoch(request.endTime());
newData.exerciseId = request.exerciseId();
newData.name = QString::fromStdString(request.name);
newData.description = QString::fromStdString(request.description);
newData.beginTime = QDateTime::fromMSecsSinceEpoch(request.beginTime);
newData.endTime = QDateTime::fromMSecsSinceEpoch(request.endTime);
newData.exerciseId = request.exerciseId;
ObjectExercisePhase *ifs(new ObjectExercisePhase(m_ddsHandler, m_db));
Core::FunctionReplyObject ret = ifs->createObject(newData);
@@ -122,21 +122,21 @@ void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleI
DEBUG_LOG(m_logger) << "onExercisePhaseModifyRequest " << request;
Core::FunctionReplyObject ret;
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ExercisePhase with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ExercisePhase with id %1 not found")).arg(request.id);
m_ddsHandler->fts()->exercisePhaseModifyReply(cookie, ret);
return;
}
Database::ExmExercisePhase data;
data.id = request.id();
data.name = QString::fromStdString(request.name());
data.description = QString::fromStdString(request.description());
data.beginTime = QDateTime::fromMSecsSinceEpoch(request.beginTime());
data.endTime = QDateTime::fromMSecsSinceEpoch(request.endTime());
data.exerciseId = request.exerciseId();
data.id = request.id;
data.name = QString::fromStdString(request.name);
data.description = QString::fromStdString(request.description);
data.beginTime = QDateTime::fromMSecsSinceEpoch(request.beginTime);
data.endTime = QDateTime::fromMSecsSinceEpoch(request.endTime);
data.exerciseId = request.exerciseId;
ret = ifs->updateObject(data);
if (ret.error())
@@ -148,30 +148,30 @@ void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleI
{
DEBUG_LOG(m_logger) << "onExercisePhaseRemoveRequest " << request;
Core::FunctionReplyObject ret;
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ExercisePhase with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ExercisePhase with id %1 not found")).arg(request.id);
m_ddsHandler->fts()->exercisePhaseRemoveReply(cookie, ret);
return;
}
// check if phase is active phase in corresponding exercise
ObjectExercise *exercise = m_mainHandler->exerciseHandler()->getExerciseById(ifs->getData().exerciseId);
if (exercise->data().activePhaseId == request.id())
if (exercise->data().activePhaseId == request.id)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ExercisePhase with id %1 is current phase in exercise")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ExercisePhase with id %1 is current phase in exercise")).arg(request.id);
m_ddsHandler->fts()->exercisePhaseRemoveReply(cookie, ret);
return;
}
ExerciseManagement::ExercisePhase ddsData;
ddsData.id(request.id());
ddsData.id = request.id;
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ddsData, 0))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ExercisePhase '%1' is used by another user!")).arg(ifs->getData().name);
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ExercisePhase '%1' is used by another user!")).arg(ifs->getData().name);
m_mainHandler->dds()->fts()->exercisePhaseRemoveReply(cookie, ret);
return;
}
@@ -184,7 +184,7 @@ void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleI
{
// delete ObjectExercise (including ExerciseStateMachine)
delete ifs;
m_exercisePhaseObjMap.remove(request.id());
m_exercisePhaseObjMap.remove(request.id);
}
m_ddsHandler->fts()->exercisePhaseRemoveReply(cookie, ret);