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/NmeaManagement/Gui/BatteryNotification/nme_battery_info_dialog.cpp

@@ -130,16 +130,16 @@ void NmeBatteryInfoDialog::updateDialog()
 
   if(m_currentBatteryStateForId.contains(0))
   {
-    m_ui->lblCaptionBatteryOne->setText(QStringLiteral("Battery 1 (") + QString::fromStdString(m_currentBatteryStateForId.value(0).serialNumber()) + QStringLiteral(")"));
+    m_ui->lblCaptionBatteryOne->setText(QStringLiteral("Battery 1 (") + QString::fromStdString(m_currentBatteryStateForId.value(0).serialNumber) + QStringLiteral(")"));
 
-    m_ui->lblBat1Current->setText(QString::number(m_currentBatteryStateForId.value(0).current()) + QStringLiteral("mA"));
-    m_ui->lblBat1Freq->setText(QString::number(m_currentBatteryStateForId.value(0).frequency()));
-    m_ui->lblBat1Generic->setText(QString::number(m_currentBatteryStateForId.value(0).generic()));
-    m_ui->lblBat1Voltage->setText(QString::number(m_currentBatteryStateForId.value(0).voltage()) + QStringLiteral(" mV"));
-    m_ui->lblBat1Level->setText(QString::number(m_currentBatteryStateForId.value(0).batteryPercent()) + QStringLiteral("%"));
-    m_ui->lblBat1Temp->setText(QString::number(m_currentBatteryStateForId.value(0).temperature()));
+    m_ui->lblBat1Current->setText(QString::number(m_currentBatteryStateForId.value(0).current) + QStringLiteral("mA"));
+    m_ui->lblBat1Freq->setText(QString::number(m_currentBatteryStateForId.value(0).frequency));
+    m_ui->lblBat1Generic->setText(QString::number(m_currentBatteryStateForId.value(0).generic));
+    m_ui->lblBat1Voltage->setText(QString::number(m_currentBatteryStateForId.value(0).voltage) + QStringLiteral(" mV"));
+    m_ui->lblBat1Level->setText(QString::number(m_currentBatteryStateForId.value(0).batteryPercent) + QStringLiteral("%"));
+    m_ui->lblBat1Temp->setText(QString::number(m_currentBatteryStateForId.value(0).temperature));
 
-    if(m_currentBatteryStateForId.value(0).batteryPercent() / 20 == 0)
+    if(m_currentBatteryStateForId.value(0).batteryPercent / 20 == 0)
     {
       m_ui->lblBat1Level->setStyleSheet(QStringLiteral("QLabel {  color : red; }"));
     }
@@ -147,16 +147,16 @@ void NmeBatteryInfoDialog::updateDialog()
 
   if(m_currentBatteryStateForId.contains(1))
   {
-    m_ui->lblCaptionBatteryTwo->setText(QStringLiteral("Battery 2 (") + QString::fromStdString(m_currentBatteryStateForId.value(1).serialNumber()) + QStringLiteral(")"));
+    m_ui->lblCaptionBatteryTwo->setText(QStringLiteral("Battery 2 (") + QString::fromStdString(m_currentBatteryStateForId.value(1).serialNumber) + QStringLiteral(")"));
 
-    m_ui->lblBat2Current->setText(QString::number(m_currentBatteryStateForId.value(1).current()) + QStringLiteral("mA"));
-    m_ui->lblBat2Freq->setText(QString::number(m_currentBatteryStateForId.value(1).frequency()));
-    m_ui->lblBat2Generic->setText(QString::number(m_currentBatteryStateForId.value(1).generic()));
-    m_ui->lblBat2Voltage->setText(QString::number(m_currentBatteryStateForId.value(1).voltage()) + QStringLiteral(" mV"));
-    m_ui->lblBat2Level->setText(QString::number(m_currentBatteryStateForId.value(1).batteryPercent()) + QStringLiteral("%"));
-    m_ui->lblBat2Temp->setText(QString::number(m_currentBatteryStateForId.value(1).temperature()));
+    m_ui->lblBat2Current->setText(QString::number(m_currentBatteryStateForId.value(1).current) + QStringLiteral("mA"));
+    m_ui->lblBat2Freq->setText(QString::number(m_currentBatteryStateForId.value(1).frequency));
+    m_ui->lblBat2Generic->setText(QString::number(m_currentBatteryStateForId.value(1).generic));
+    m_ui->lblBat2Voltage->setText(QString::number(m_currentBatteryStateForId.value(1).voltage) + QStringLiteral(" mV"));
+    m_ui->lblBat2Level->setText(QString::number(m_currentBatteryStateForId.value(1).batteryPercent) + QStringLiteral("%"));
+    m_ui->lblBat2Temp->setText(QString::number(m_currentBatteryStateForId.value(1).temperature));
 
-    if(m_currentBatteryStateForId.value(1).batteryPercent() / 20 == 0)
+    if(m_currentBatteryStateForId.value(1).batteryPercent / 20 == 0)
     {
       m_ui->lblBat2Level->setStyleSheet(QStringLiteral("QLabel {  color : red; }"));
     }
@@ -164,7 +164,7 @@ void NmeBatteryInfoDialog::updateDialog()
 }
 void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &data, DataModification modType)
 {
-  if(data.equipmentNumber() != 1)
+  if(data.equipmentNumber != 1)
     return;
 
   switch (modType)
@@ -172,13 +172,13 @@ void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &da
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_currentBatteryWarnForId.insert(data.batteryPort(),data);
+    m_currentBatteryWarnForId.insert(data.batteryPort,data);
     updateDialog();
     break;
   }
   case DataModification::eRemoved:
   {
-    m_currentBatteryWarnForId.remove(data.batteryPort());
+    m_currentBatteryWarnForId.remove(data.batteryPort);
     updateDialog();
   }
   }
@@ -186,28 +186,28 @@ void NmeBatteryInfoDialog::fillWarnings(const TrainingAreaBase::BatteryAlarm &da
 
 void NmeBatteryInfoDialog::fillStates(const TrainingAreaBase::BatteryInfo &dataArr, DataModification modType)
 {
-  if(dataArr.equipmentNumber() != 1)
+  if(dataArr.equipmentNumber != 1)
     return;
 
-  auto data = dataArr.batteryStates().at(0);
+  auto data = dataArr.batteryStates.at(0);
 
   switch (modType)
   {
   case DataModification::eAdded:
   case DataModification::eModified:
   {
-    m_currentBatteryStateForId.insert(data.batteryPort(),data);
+    m_currentBatteryStateForId.insert(data.batteryPort,data);
     updateDialog();
-    if(data.batteryPort() == 0)
+    if(data.batteryPort == 0)
       m_oudatedFirstBatteryTimer->start(30000);
-    else if(data.batteryPort() == 1)
+    else if(data.batteryPort == 1)
       m_oudatedSecondBatteryTimer->start(30000);
     break;
   }
   case DataModification::eRemoved:
   {
     if(!m_currentBatteryStateForId.isEmpty())
-      m_currentBatteryStateForId.remove(data.batteryPort());
+      m_currentBatteryStateForId.remove(data.batteryPort);
     updateDialog();
   }
   }

qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_notification_gui_plugin.cpp

@@ -3,6 +3,7 @@
 
 
 #include "nme_battery_info_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "nme_notification_gui_plugin.h"
 #include "nme_shutdown_dialog.h"
 
@@ -122,9 +123,9 @@ void InterfaceImpl::clearInterfaces()
 
 void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataArr, DataModification modType)
 {
-  if(dataArr.equipmentNumber() != 1)
+  if(dataArr.equipmentNumber != 1)
     return;
-  auto data = dataArr.batteryStates().at(0);
+  auto data = dataArr.batteryStates.at(0);
 
   switch (modType)
   {
@@ -138,20 +139,20 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
       if (m_session->baseLayout() != nullptr)
         m_session->baseLayout()->showMessage(tr("The radio master is connected"), tr("Connection was successfully reestablished"), LtsWidgets::LtsNotificationBox::MessageType::Success);
     }
-    if((data.batteryPercent() / 20) < m_currentBatteryStateForId.value(data.batteryPort()).batteryPercent() / 20 && data.batteryPercent() / 20 < 2)
+    if((data.batteryPercent / 20) < m_currentBatteryStateForId.value(data.batteryPort).batteryPercent / 20 && data.batteryPercent / 20 < 2)
     {
       QMessageBox batteryWarnBox;
       batteryWarnBox.setWindowTitle(tr("Battery Warning"));
-      batteryWarnBox.setText(tr("The battery (%1) has only %2 \% left").arg(QString::fromStdString(data.serialNumber())).arg(data.batteryPercent())); 
+      batteryWarnBox.setText(tr("The battery (%1) has only %2 \% left").arg(QString::fromStdString(data.serialNumber)).arg(data.batteryPercent));
       batteryWarnBox.exec();
     }
-    m_currentBatteryStateForId.insert(data.batteryPort(), data);
+    m_currentBatteryStateForId.insert(data.batteryPort, data);
 
     updateBatteryLevel();
 
-    if(data.batteryPort() == 0)
+    if(data.batteryPort == 0)
       m_oudatedFirstBatteryTimer->start(30000);
-    else if(data.batteryPort() == 1)
+    else if(data.batteryPort == 1)
       m_oudatedSecondBatteryTimer->start(30000);
 
     break;
@@ -159,7 +160,7 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
 
   case DataModification::eRemoved:
   {
-    m_currentBatteryStateForId.remove(data.batteryPort());
+    m_currentBatteryStateForId.remove(data.batteryPort);
     updateBatteryLevel();
     break;
   }
@@ -169,7 +170,7 @@ void InterfaceImpl::onBatteryChanged(const TrainingAreaBase::BatteryInfo &dataAr
 
 void InterfaceImpl::onShutdownStateChanged(const TrainingAreaBase::ServiceControl &data, DataModification modType)
 {
-  if(data.equipmentNumber() != 1)
+  if(data.equipmentNumber != 1)
     return;
 
   switch (modType)
@@ -178,7 +179,7 @@ void InterfaceImpl::onShutdownStateChanged(const TrainingAreaBase::ServiceContro
   case DataModification::eModified:
   {
 
-    if(data.serviceControlState().underlying() == TrainingAreaBase::ServiceControlEnum::STOP)
+    if(data.serviceControlState == TrainingAreaBase::ServiceControlEnum::STOP)
     {
       m_hasConnection = false;
       if (m_session->baseLayout() != nullptr)
@@ -208,8 +209,8 @@ void InterfaceImpl::onOutdatedFirstBatteryTimerTimeout()
     return;
   }
 
-  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99, m_currentBatteryStateForId.value(1).batteryPercent() / 20)));
-  setToolTip(99, m_currentBatteryStateForId.value(1).batteryPercent() / 20);
+  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99, m_currentBatteryStateForId.value(1).batteryPercent / 20)));
+  setToolTip(99, m_currentBatteryStateForId.value(1).batteryPercent / 20);
   m_currentBatteryStateForId.remove(0);
 
 }
@@ -227,8 +228,8 @@ void InterfaceImpl::onOutdatedSecondBatteryTimerTimeout()
     return;
   }
   
-  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(m_currentBatteryStateForId.value(0).batteryPercent() / 20, 99)));
-  setToolTip(m_currentBatteryStateForId.value(0).batteryPercent() / 20, 99);
+  m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(m_currentBatteryStateForId.value(0).batteryPercent / 20, 99)));
+  setToolTip(m_currentBatteryStateForId.value(0).batteryPercent / 20, 99);
   m_currentBatteryStateForId.remove(1);
 }
 
@@ -363,8 +364,8 @@ void InterfaceImpl::updateBatteryLevel()
     m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage()));
     return;
   }
-  int firstBatteryState = m_currentBatteryStateForId.value(0).batteryPercent() / 20;
-  int secondBatteryState = m_currentBatteryStateForId.value(1).batteryPercent() / 20;
+  int firstBatteryState = m_currentBatteryStateForId.value(0).batteryPercent / 20;
+  int secondBatteryState = m_currentBatteryStateForId.value(1).batteryPercent / 20;
 
   if(m_currentBatteryStateForId.values().length() == 2)
   {
@@ -373,12 +374,12 @@ void InterfaceImpl::updateBatteryLevel()
   }
   else if(m_currentBatteryStateForId.values().length() == 1)
   {
-    if(m_currentBatteryStateForId.first().batteryPort() == 0)
+    if(m_currentBatteryStateForId.first().batteryPort == 0)
     {
       m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(firstBatteryState, 99)));
       setToolTip(firstBatteryState, 99);
     }
-    else if(m_currentBatteryStateForId.first().batteryPort() == 1)
+    else if(m_currentBatteryStateForId.first().batteryPort == 1)
     {
       m_notiBattery->setIcon(QPixmap::fromImage(renderBatteryImage(99,secondBatteryState)));
       setToolTip(99,secondBatteryState);

qt6-after/qt6-migrated-legatus/Lts/Plugins/NmeaManagement/Gui/BatteryNotification/nme_shutdown_dialog.cpp

@@ -62,9 +62,9 @@ void NmeShutdownDialog::onShutdownClicked()
     return;
   TrainingAreaBase::SetDevicePowerRequest request;
 
-  request.equipmentNumber(1);
-  request.powerType(TrainingAreaBase::PowerMethod::PowerOff); 
-  request.subdeviceId(0); 
+  request.equipmentNumber = 1;
+  request.powerType = TrainingAreaBase::PowerMethod::PowerOff;
+  request.subdeviceId = 0;
 
   auto cb = [request, this]()
   {