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

Migrates OcSituation and ServiceManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:47 +02:00
1 parent 95071993f5
commit 3ec4208139
30 files changed
+1000 -1007
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
+17 -17
View File
@@ -36,8 +36,8 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
, m_pidProc(new QProcess(this))
, m_logger(getLogger("ServiceProcess"))
{
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId),
QStringLiteral("-d"), QString::number(m_groupData.domainId)});
bool isInReplayGroup = false;
for(const QString &currentGroup : parentService->groups())
@@ -50,9 +50,9 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
}
if (isInReplayGroup)
args << QStringLiteral("-r") << QString::number(m_groupData.replayPartitionId());
args.reserve(args.size() + m_groupData.additionalStartParameter().size());
for (const std::string &arg : m_groupData.additionalStartParameter())
args << QStringLiteral("-r") << QString::number(m_groupData.replayPartitionId);
args.reserve(args.size() + m_groupData.additionalStartParameter.size());
for (const std::string &arg : m_groupData.additionalStartParameter)
args << QString::fromStdString(arg);
setArguments(args);
@@ -146,8 +146,8 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG(m_logger) << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId),
QStringLiteral("-d"), QString::number(m_groupData.domainId)});
setProgram(QStringLiteral("ssh"));
QStringList remoteCommand2;
remoteCommand2.append(Settings::hlaRemoteServer());
@@ -190,8 +190,8 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG(m_logger) << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId),
QStringLiteral("-d"), QString::number(m_groupData.domainId)});
setProgram(QStringLiteral("ssh"));
QStringList remoteCommand2;
remoteCommand2.append(Settings::hlaRemoteServer());
@@ -245,15 +245,15 @@ int ServiceManagement::ServiceProcess::serviceProcessId() const
void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::CurrentRunningState &data)
{
DEBUG_LOG(m_logger) << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
DEBUG_LOG(m_logger) << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState;
m_failedStartAttemptCounter = 0;
m_lastHeartbeatMSec = QDateTime::currentMSecsSinceEpoch();
m_runningState = data.runningState();
m_ports = data.ports();
m_runningState = data.runningState;
m_ports = data.ports;
std::string es;
if (data.errorString().is_set())
es = data.errorString().get();
if (data.errorString.is_set())
es = data.errorString.get();
ServiceInformation info(m_serviceProcessId,
m_lastHeartbeatMSec,
@@ -267,8 +267,8 @@ void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::Cur
void ServiceManagement::ServiceProcess::killallRemote()
{
QStringList arg({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
QStringList arg({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId),
QStringLiteral("-d"), QString::number(m_groupData.domainId)});
QProcess sh;
sh.setProgram(QStringLiteral("ssh"));
QStringList args;
@@ -401,7 +401,7 @@ void ServiceManagement::ServiceProcess::setNewStateFromChangeRequest(const Core:
{
if (m_runningState != newState)
{
switch (newState.underlying())
switch (newState)
{
case Core::RunningState::Running:
case Core::RunningState::Starting: