Migrates remaining services and plugins to generated rtiddsgen API

Converts accessor calls to plain member access across the residual service set.

qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/handler_situation_replay.cpp

@@ -77,17 +77,17 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
 {
   DEBUG_LOG(m_logger) << "onStartReplayRequest: " << request;
   // Start only own replay
-  if (request.replayPartitionId() != m_partitionId)
-    return Core::FunctionReplyObject(request.replayPartitionId(),tr_lts("dds", "Wrong replay partition"));
+  if (request.replayPartitionId != m_partitionId)
+    return Core::FunctionReplyObject(request.replayPartitionId,tr_lts("dds", "Wrong replay partition"));
   if (m_objSrp && m_objSrp->srpState() != SrpState::Stopped)
-    return Core::FunctionReplyObject(request.replayPartitionId(), tr_lts("dds", "Replay is not yet stopped"));
+    return Core::FunctionReplyObject(request.replayPartitionId, tr_lts("dds", "Replay is not yet stopped"));
 
   Database::SrpSituationReplay newData;
   newData.srpStateId        = SrpState::Started;
   newData.replayPartitionId = m_partitionId;
-  newData.beginTime         = request.beginTime();
-  newData.endTime           = request.endTime();
-  newData.pace              = request.pace().is_set() ? request.pace().get() : 1;
+  newData.beginTime         = request.beginTime;
+  newData.endTime           = request.endTime;
+  newData.pace              = request.pace.is_set() ? request.pace.get() : 1;
 
   // round to sec
   newData.beginTime = (newData.beginTime / 1000) * 1000;
@@ -95,7 +95,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
     newData.endTime = ((newData.endTime / 1000) + 1) * 1000;
 
   if (!m_objSrp && !createObject(newData))
-    return Core::FunctionReplyObject(request.replayPartitionId(),tr_lts("dds", "Internal error"));
+    return Core::FunctionReplyObject(request.replayPartitionId,tr_lts("dds", "Internal error"));
 
   m_objSrp->setSrpData(newData);
   return Core::FunctionReplyObject(m_objSrp->getId());
@@ -106,10 +106,10 @@ Core::FunctionReplyObject HandlerSituationReplay::stopReplayRequest(const Situat
   DEBUG_LOG(m_logger) << "onStopReplayRequest: " << request;
 
   if (m_objSrp == nullptr)
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId());
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId);
 
-  if (m_objSrp && (m_objSrp->getId() != request.id() || m_objSrp->getReplayPartitionId() != request.replayPartitionId()))
-    return Core::FunctionReplyObject(request.id(),tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id()).arg(m_objSrp->getId());
+  if (m_objSrp && (m_objSrp->getId() != request.id || m_objSrp->getReplayPartitionId() != request.replayPartitionId))
+    return Core::FunctionReplyObject(request.id,tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id).arg(m_objSrp->getId());
 
   Core::FunctionReplyObject ret = m_objSrp->switchToState(SrpState::Stopped);
   if (!ret.error())
@@ -123,42 +123,42 @@ Core::FunctionReplyObject HandlerSituationReplay::stopReplayRequest(const Situat
 
 Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const SituationReplay::ChangeReplayStateRequest &request)
 {
-  if (request.state() != SrpState_def::Started)
+  if (request.state != SrpState::Started)
   {
     if (m_objSrp == nullptr)
-      return Core::FunctionReplyObject(request.id(), tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId());
+      return Core::FunctionReplyObject(request.id, tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId);
 
-    if (m_objSrp && (m_objSrp->getId() != request.id() || m_objSrp->getReplayPartitionId() != request.replayPartitionId()))
-      return Core::FunctionReplyObject(request.id(),tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id()).arg(m_objSrp->getId());
+    if (m_objSrp && (m_objSrp->getId() != request.id || m_objSrp->getReplayPartitionId() != request.replayPartitionId))
+      return Core::FunctionReplyObject(request.id,tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id).arg(m_objSrp->getId());
   }
 
-  if (request.pace().is_set())
-    m_objSrp->setPace(request.pace().get());
+  if (request.pace.is_set())
+    m_objSrp->setPace(request.pace.get());
 
-  switch (request.state().underlying())
+  switch (request.state)
   {
-  case SrpState_def::Unknown:
-    if (request.pace().is_set())
-      return Core::FunctionReplyObject(request.id());
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not handle command 'Unknown' in changeReplayStateRequest"));
-  case SrpState_def::Started:
+  case SrpState::Unknown:
+    if (request.pace.is_set())
+      return Core::FunctionReplyObject(request.id);
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not handle command 'Unknown' in changeReplayStateRequest"));
+  case SrpState::Started:
     return startReplayRequest(request);
-  case SrpState_def::Resumed:
+  case SrpState::Resumed:
   {
-    DEBUG_LOG(m_logger) << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
-    if (request.beginTime() != 0 && request.beginTime() != m_objSrp->currentReplayTime())
+    DEBUG_LOG(m_logger) << "Resume request: " << request.beginTime << ", cur playback time: " << m_objSrp->currentReplayTime();
+    if (request.beginTime != 0 && request.beginTime != m_objSrp->currentReplayTime())
     {
       stopReplayRequest(request);
       return startReplayRequest(request);
     }
     Q_FALLTHROUGH();
-  case SrpState_def::Paused:
-    return m_objSrp->switchToState(request.state());
+  case SrpState::Paused:
+    return m_objSrp->switchToState(request.state);
   }
-  case SrpState_def::Stopped:
+  case SrpState::Stopped:
     return stopReplayRequest(request);
   }
-  return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Unhandled request state %1")).arg(request.state().underlying());
+  return Core::FunctionReplyObject(request.id, tr_lts("dds", "Unhandled request state %1")).arg(static_cast<int>(request.state));
 }
 
 void HandlerSituationReplay::onChangeReplayStateRequest(const rti::core::SampleIdentity &cookie,