Migrates OcSituation and ServiceManagement to generated rtiddsgen API
Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
30 files changed
+1000
-1007
No files matched your search
@@ -80,13 +80,13 @@ bool Group::setRunningState(Core::RunningState newState)
|
||||
INFO_LOG(m_logger) << "Setting RunningState of group "
|
||||
<< m_scheme->groupType
|
||||
<< " in exercisePartition "
|
||||
<< m_groupData.exercisePartitionId()
|
||||
<< m_groupData.exercisePartitionId
|
||||
<< ", replayPartition "
|
||||
<< m_groupData.replayPartitionId()
|
||||
<< m_groupData.replayPartitionId
|
||||
<< " to "
|
||||
<< newState;
|
||||
|
||||
switch (newState.underlying())
|
||||
switch (newState)
|
||||
{
|
||||
case Core::RunningState::Running:
|
||||
case Core::RunningState::Starting:
|
||||
@@ -275,9 +275,9 @@ void Group::onNewServiceInfo()
|
||||
GroupInformation info(m_groupId,
|
||||
lastHeartbeatMSec(),
|
||||
m_scheme->groupType,
|
||||
m_groupData.domainId(),
|
||||
m_groupData.exercisePartitionId(),
|
||||
m_groupData.replayPartitionId(),
|
||||
m_groupData.domainId,
|
||||
m_groupData.exercisePartitionId,
|
||||
m_groupData.replayPartitionId,
|
||||
serviceIds);
|
||||
|
||||
TRACE_LOG(m_logger) << "Publishing new GroupInformation: " << info;
|
||||
@@ -350,11 +350,11 @@ void Group::onCompleteCoreTick()
|
||||
QTimer::singleShot(1000, this, &Group::onCompleteCoreTick);
|
||||
}
|
||||
|
||||
ServiceProcess *Group::procFromPid(Q_PID pid)
|
||||
ServiceProcess *Group::procFromPid(qint64 pid)
|
||||
{
|
||||
for (ServiceProcess *proc :qAsConst(m_serviceProcs))
|
||||
{
|
||||
if (proc->pid() == pid)
|
||||
if (proc->processId() == pid)
|
||||
return proc;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Searched for not existing process with PID "
|
||||
|
||||
Reference in new issue
Block a user