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

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

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.cpp

@@ -2,6 +2,7 @@
 
 
 #include "topic_editor.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_topic_editor.h"
 #include "../replay_control_widget.h"
 
@@ -45,6 +46,7 @@ SituationReplayEditor::SituationReplayEditor(
   , m_markerModel(markerModel)
   , m_applyFilter(applyFilter)
   , m_ui(new Ui::SituationReplayEditor)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->lblDuration->setText(QStringLiteral(" - "));
@@ -461,7 +463,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
 {
   const MarkerManagement::Marker marker = m_markerModel->getRowData(idx.row());
 
-  if (marker.id() <= 0)
+  if (marker.id <= 0)
   {
     ERROR_LOG(m_logger) << "marker has id 0";
     return;
@@ -471,7 +473,7 @@ void SituationReplayEditor::onMarkerSelected(const QModelIndex &idx)
   
   
   onChangesMade();
-  setFilterAndSettings(QByteArray(marker.filter().c_str(), marker.filter().size()), QByteArray(marker.mapSettings().c_str(), marker.mapSettings().size()));
+  setFilterAndSettings(QByteArray(marker.filter.c_str(), marker.filter.size()), QByteArray(marker.mapSettings.c_str(), marker.mapSettings.size()));
   slotChangesMade();
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/TopicEditor/topic_editor.h

@@ -2,8 +2,8 @@
 
 
 #pragma once
-#include <MarkerManagement/Common/mrk_dialog_model.h>
-#include <MarkerManagement/Common/mrk_apply_filter.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_dialog_model.h>
+#include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <MarkerManagement/mrk.hpp>
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_dialog.cpp

@@ -2,6 +2,7 @@
 
 
 #include "replay_control_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtWidgets/QHBoxLayout>
 
@@ -11,6 +12,7 @@ namespace SituationReplay
 
 SituationReplayControlDialog::SituationReplayControlDialog(SituationReplayControlWidget *replayWidget, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   auto l = new QHBoxLayout;
   setLayout(l);

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_gui_plugin.cpp

@@ -13,6 +13,7 @@
 #include <SituationMapPlugin/situation_map_script_filter_gui_plugin_interface.h>
 
 #include <QtCore/QJsonDocument>
+#include <QtCore/QFile>
 
 
 namespace SituationReplay

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplay/Gui/ReplayControl/replay_control_widget.cpp

@@ -3,6 +3,7 @@
 
 
 #include "replay_control_widget.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 #include "replay_control_dialog.h"
 #include "ui_replay_control_widget.h"
@@ -36,6 +37,7 @@ SituationReplayControlWidget::SituationReplayControlWidget(QWidget *parent)
   , m_state(SrpState::Unknown)
   , m_toggleStartPauseButton(true)
   , m_speedValueChangedTimer(new QTimer(this))
+, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
   m_ui->setupUi(this);
   m_ui->pbStart->setHidden(m_toggleStartPauseButton);
@@ -136,12 +138,12 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
     const QMap<qint32, SituationReplay::SitReplay> replays = m_dtc->sitReplays();
     for (const SituationReplay::SitReplay &replay : replays)
     {
-      if (replay.replayPartitionId() == m_partitionId)
+      if (replay.replayPartitionId == m_partitionId)
       {
-        m_state = replay.state();
-        m_id = replay.id();
+        m_state = replay.state;
+        m_id = replay.id;
         DEBUG_LOG(m_logger) << "recycling replay with id" << m_id;
-        m_ui->dteStartTime->setMsecsSinceEpoch(replay.beginTime());
+        m_ui->dteStartTime->setMsecsSinceEpoch(replay.beginTime);
         useExistingReplay = true; 
         break;
       }
@@ -186,7 +188,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
 
   const ExerciseManagement::Exercise &exercise = m_exmDtc->exercise(m_session->exerciseId());
-  const qint64 stopTime = exercise.stopTime();
+  const qint64 stopTime = exercise.stopTime;
   if (stopTime > 0)
   {
     m_ui->lblEnd->setText(DTG::toStringMSec(stopTime));
@@ -207,7 +209,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
 
       excDtc->waitForHistoricalDataExercise(3000);
       ExerciseManagement::Exercise exc = excDtc->exercise(excId);
-      qint64 startTime = exc.startTime();
+      qint64 startTime = exc.startTime;
 
       if (startTime > 0)
       {
@@ -216,7 +218,7 @@ bool SituationReplayControlWidget::init(LtsSession::LtsSession *session,
       }
       else
       {
-        qint64 beginTime = exc.beginTime();
+        qint64 beginTime = exc.beginTime;
 
         if (beginTime > 0)
         {
@@ -370,10 +372,10 @@ void SituationReplayControlWidget::pauseReplay()
     disableAllReplayButtons(); 
 
     ChangeReplayStateRequest req;
-    req.id(m_id);
-    req.replayPartitionId(m_partitionId);
-    req.state(SrpState::Paused);
-    req.pace(m_ui->slSpeed->value() / 10.);
+    req.id = m_id;
+    req.replayPartitionId = m_partitionId;
+    req.state = SrpState::Paused;
+    req.pace = m_ui->slSpeed->value() / 10.;
 
     if (!m_requestHelper->startSingleRequest([req, this]()
     {
@@ -405,9 +407,9 @@ void SituationReplayControlWidget::stopReplay()
   disableAllReplayButtons(); 
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Stopped);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Stopped;
 
   
   const bool wasQuiet = m_requestHelper->quiet();
@@ -440,12 +442,12 @@ void SituationReplayControlWidget::resumeReplay()
   disableAllReplayButtons(); 
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Resumed);
-  req.beginTime(m_ui->dteStartTime->msecsSinceEpoch());
-  req.endTime(0); 
-  req.pace(m_ui->slSpeed->value() / 10.);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Resumed;
+  req.beginTime = m_ui->dteStartTime->msecsSinceEpoch();
+  req.endTime = 0; 
+  req.pace = m_ui->slSpeed->value() / 10.;
 
   if (!m_requestHelper->startSingleRequest([req, this]()
   {
@@ -460,15 +462,15 @@ void SituationReplayControlWidget::resumeReplay()
 
 void SituationReplayControlWidget::onSitReplayChanged(const SitReplay &data, DataModification modType)
 {
-  DEBUG_LOG(m_logger) << "onSitReplayChanged: id = " << data.id() << ", exId = " << data.exerciseId() << ", repPartitionId = " << data.replayPartitionId()
-                        << ", state = " << (int)data.state().underlying() << ", m_partitionId = " << m_partitionId << ", modType = " << (int)modType;
+  DEBUG_LOG(m_logger) << "onSitReplayChanged: id = " << data.id << ", exId = " << data.exerciseId << ", repPartitionId = " << data.replayPartitionId
+                        << ", state = " << (int)data.state << ", m_partitionId = " << m_partitionId << ", modType = " << (int)modType;
 
-  if (m_partitionId != data.replayPartitionId())
+  if (m_partitionId != data.replayPartitionId)
     return;
 
   if (modType == DataModification::eAdded ||
       modType == DataModification::eModified)
-    m_state = data.state();
+    m_state = data.state;
   else
     m_state = SrpState::Stopped;
 
@@ -497,7 +499,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     return;
 
   MarkerManagement::Marker marker = m_markerModel->getRowData(index.row());
-  const qint64 mSecsSinceEpoch = marker.timeStamp() - marker.timeStampOffset();
+  const qint64 mSecsSinceEpoch = marker.timeStamp - marker.timeStampOffset;
   m_ui->slPeriodSlider->setValue(getSecs(mSecsSinceEpoch));
   m_ui->dteStartTime->setMsecsSinceEpoch(mSecsSinceEpoch);
 
@@ -516,9 +518,9 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
 
 
   
-  if (marker.filter().size() > 0 && appFilter != nullptr)
+  if (marker.filter.size() > 0 && appFilter != nullptr)
   {
-    QByteArray mapFilter(QByteArray::fromRawData(marker.filter().c_str(), marker.filter().size()));
+    QByteArray mapFilter(QByteArray::fromRawData(marker.filter.c_str(), marker.filter.size()));
     if (appFilter->applyFilter(mapFilter))
       emit signalSetMapFilter(mapFilter);
     else
@@ -529,14 +531,14 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     
     if (m_sitMapGuiIfc != nullptr)
     {
-      const std::vector<MarkerManagement::MarkerDescription> &descriptionsRef = marker.descriptions();
+      const std::vector<MarkerManagement::MarkerDescription> &descriptionsRef = marker.descriptions;
       QList<MarkerManagement::MarkerType> markerTypes;
       markerTypes.reserve(descriptionsRef.size());
       for (const MarkerManagement::MarkerDescription &desc : std::as_const(descriptionsRef))
-        markerTypes.append(desc.markerType());
+        markerTypes.append(desc.markerType);
 
       if (markerTypes.contains(MarkerManagement::MarkerType::Situation))
-        m_sitMapGuiIfc->setCenterPoint(QPointF(marker.position().lon(), marker.position().lat()));
+        m_sitMapGuiIfc->setCenterPoint(QPointF(marker.position.lon, marker.position.lat));
     }
   }
 
@@ -544,7 +546,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
   
   if (appFilter)
   {
-    QByteArray mapSettings(QByteArray::fromRawData(marker.mapSettings().c_str(), marker.mapSettings().size()));
+    QByteArray mapSettings(QByteArray::fromRawData(marker.mapSettings.c_str(), marker.mapSettings.size()));
     DEBUG_LOG(m_logger) << "set map settings from marker " << (mapSettings.toStdString());
 
     
@@ -558,7 +560,7 @@ void SituationReplayControlWidget::onMarkerClicked(const QModelIndex &index)
     auto pos = std::remove_if( oms.orderedLayers.begin(),
                          oms.orderedLayers.end(),
                          [](const QPair<QString, SituationMap::LayerParameter> &pair) { return pair.first == LayerNameEmergencyCall; } );
-    DEBUG_LOG(m_logger) << ">>>> remove iterator: " << pos << " END: " << oms.orderedLayers.end();
+    DEBUG_LOG(m_logger) << ">>>> remove iterator: " << (pos - oms.orderedLayers.begin()) << " END: " << oms.orderedLayers.size();
     if(pos != oms.orderedLayers.end())
       oms.orderedLayers.erase(pos);
 
@@ -581,7 +583,7 @@ void SituationReplayControlWidget::enaDisa()
   bool enaStop = false;
   bool enaPause = false;
 
-  switch (m_state.underlying())
+  switch (m_state)
   {
   case SrpState::Paused:
     enaStart = false;
@@ -627,12 +629,12 @@ bool SituationReplayControlWidget::startReplayDelayed(qint64 start, qint64 end,
   }
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.state(SrpState::Started);
-  req.beginTime(start);
-  req.endTime(end);
-  req.pace(speed);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.state = SrpState::Started;
+  req.beginTime = start;
+  req.endTime = end;
+  req.pace = speed;
 
   ERROR_LOG(m_logger) << "Start Replay Partition: "
                      << "id: " << m_id
@@ -725,9 +727,9 @@ void SituationReplayControlWidget::onSpeedValueChanged()
     return;
 
   ChangeReplayStateRequest req;
-  req.id(m_id);
-  req.replayPartitionId(m_partitionId);
-  req.pace(speed);
+  req.id = m_id;
+  req.replayPartitionId = m_partitionId;
+  req.pace = speed;
 
   m_requestHelper->startSingleRequest([req, this]()
   {