Migrates remaining services and plugins to generated rtiddsgen API
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
104 files changed
+2424
-2430
No files matched your search
+12
-12
@@ -40,13 +40,13 @@ ObjectSituationReplay::~ObjectSituationReplay()
|
||||
|
||||
bool ObjectSituationReplay::isStopped() const
|
||||
{
|
||||
return (m_data.srpStateId == SituationReplay::SrpState_def::Stopped);
|
||||
return (m_data.srpStateId == SituationReplay::SrpState::Stopped);
|
||||
}
|
||||
|
||||
bool ObjectSituationReplay::isRunning() const
|
||||
{
|
||||
return (m_data.srpStateId == SituationReplay::SrpState_def::Started ||
|
||||
m_data.srpStateId == SituationReplay::SrpState_def::Resumed);
|
||||
return (m_data.srpStateId == SituationReplay::SrpState::Started ||
|
||||
m_data.srpStateId == SituationReplay::SrpState::Resumed);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectSituationReplay::createObject(const Database::SrpSituationReplay &data)
|
||||
@@ -55,7 +55,7 @@ Core::FunctionReplyObject ObjectSituationReplay::createObject(const Database::Sr
|
||||
m_data = data;
|
||||
setPace(m_data.pace);
|
||||
m_data.id = 0;
|
||||
m_data.srpStateId = SituationReplay::SrpState_def::Unknown;
|
||||
m_data.srpStateId = SituationReplay::SrpState::Unknown;
|
||||
m_currentReplayTime = m_data.beginTime;
|
||||
if (m_db)
|
||||
{
|
||||
@@ -70,7 +70,7 @@ Core::FunctionReplyObject ObjectSituationReplay::createObject(const Database::Sr
|
||||
// Id is serial -> will be generated by db => inside m_data after db-insert
|
||||
DEBUG_LOG(m_logger) << "New srpId: " << m_data.id;
|
||||
|
||||
switchToState(SituationReplay::SrpState_def::Stopped);
|
||||
switchToState(SituationReplay::SrpState::Stopped);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
@@ -216,7 +216,7 @@ bool ObjectSituationReplay::checkPublishData()
|
||||
onPublishReplayTime();
|
||||
if (m_data.endTime != 0 && m_data.endTime < m_currentReplayTime)
|
||||
{
|
||||
if (switchToState(SrpState_def::Stopped).error())
|
||||
if (switchToState(SrpState::Stopped).error())
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -234,7 +234,7 @@ bool ObjectSituationReplay::checkPublishData()
|
||||
QElapsedTimer timerReadData; if (m_logger.isInfoEnabled()) timerReadData.start();
|
||||
|
||||
m_dbReader->waitForAsyncOperations(m_data.endTime);
|
||||
if (switchToState(SrpState_def::Stopped).error())
|
||||
if (switchToState(SrpState::Stopped).error())
|
||||
return false;
|
||||
|
||||
if (m_logger.isInfoEnabled()) INFO_LOG(m_logger) << "m_dbReader->waitForAsyncOperations took " << timerReadData.elapsed() << " [ms]";
|
||||
@@ -262,21 +262,21 @@ Core::FunctionReplyObject ObjectSituationReplay::switchToState(SrpState newSrpSt
|
||||
<< ", current: " << m_data.srpStateId;
|
||||
if (m_data.srpStateId != newSrpState)
|
||||
{
|
||||
switch (newSrpState.underlying())
|
||||
switch (newSrpState)
|
||||
{
|
||||
case SrpState_def::Paused:
|
||||
case SrpState::Paused:
|
||||
if (!pause())
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Could not pause replay"));
|
||||
break;
|
||||
case SrpState_def::Resumed:
|
||||
case SrpState::Resumed:
|
||||
if (!resume())
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Could not resume replay"));
|
||||
break;
|
||||
case SrpState_def::Started:
|
||||
case SrpState::Started:
|
||||
if (!start())
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Could not start replay"));
|
||||
break;
|
||||
case SrpState_def::Stopped:
|
||||
case SrpState::Stopped:
|
||||
if (!stop())
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Could not stop replay"));
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user