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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp
+14 -14
View File
@@ -65,7 +65,7 @@ public:
if (rp.fi != nullptr)
continue;
if (rp.id() == partitionId)
if (rp.id == partitionId)
rp.fi = fi;
}
}
@@ -144,19 +144,19 @@ public:
});
repl.fi = nullptr;
repl.id(idToUse);
repl.name((QStringLiteral("srp_%1").arg(idToUse)).toStdString());
repl.exerciseId(exerciseId);
repl.workstationId(workstationId);
repl.operatorId(operatorId);
repl.replayType(replayType);
repl.domainId(domainIdReplay);
repl.id = idToUse;
repl.name = (QStringLiteral("srp_%1").arg(idToUse)).toStdString();
repl.exerciseId = exerciseId;
repl.workstationId = workstationId;
repl.operatorId = operatorId;
repl.replayType = replayType;
repl.domainId = domainIdReplay;
repl.proc->setProgram(QCoreApplication::applicationDirPath() + QStringLiteral("/svcSituationReplay"));
QString input = QString::number(domainId) + QLatin1Char(',') + QString::number(exerciseId);
if (!tcpConnectionUrl.isEmpty())
input += QLatin1Char(',') + tcpConnectionUrl.toString();
QString output = QString::number(repl.domainId()) + QLatin1Char(',') + QString::number(repl.id());
QString output = QString::number(repl.domainId) + QLatin1Char(',') + QString::number(repl.id);
repl.proc->setArguments({QStringLiteral("--input"), input,
QStringLiteral("--output"), output,
@@ -299,9 +299,9 @@ public:
while (it != m_replayPartitions.end())
{
const ReplayPartitionEx &rp = it.value();
if ((partitionId != 0 && rp.id() != partitionId) ||
(workstationId != 0 && rp.workstationId() != workstationId) ||
(operatorId != 0 && rp.operatorId() != operatorId) ||
if ((partitionId != 0 && rp.id != partitionId) ||
(workstationId != 0 && rp.workstationId != workstationId) ||
(operatorId != 0 && rp.operatorId != operatorId) ||
(fi != nullptr && rp.fi != fi))
{
++it;
@@ -338,12 +338,12 @@ public:
{
try
{
DEBUG_LOG(m_logger) << "Waiting for replay to process to shutdown... Replay id: " << rp.id();
DEBUG_LOG(m_logger) << "Waiting for replay to process to shutdown... Replay id: " << rp.id;
LtsUtils::awaitTimeout(10000, rp.proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), true);
}
catch (...)
{
WARNING_LOG(m_logger) << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id();
WARNING_LOG(m_logger) << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id;
cb();
}
}