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/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp

@@ -18,6 +18,7 @@ namespace GuezIedManagement {
 
 InfoDialog::InfoDialog(int iedEntityId, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
+  , m_logger(getLogger("IedInfoDialog"))
   , m_iedEntityId(iedEntityId)
   , m_session(nullptr)
   , m_dtc(nullptr)
@@ -68,84 +69,84 @@ bool InfoDialog::init(LtsSession::LtsSession *session,
 
 void InfoDialog::retranslate()
 {
-  translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber()), false, tr("IED"));
+  translate(m_ui, QString::number(m_dtc->ied(m_iedEntityId).equipmentNumber), false, tr("IED"));
 }
 
 void InfoDialog::showIedInfos()
 {
   Ied ied = m_dtc->ied(m_iedEntityId);
 
-  m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber()));
-  m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId()).name()));
-  m_ui->lblDesignator->setText(QString::fromStdString(ied.name()));
+  m_ui->lblEquipmentNumber->setText(QString::number(ied.equipmentNumber));
+  m_ui->lblParty->setText(ParticipantManagement::trPartyName(m_ppmDtc->party(ied.partyId).name));
+  m_ui->lblDesignator->setText(QString::fromStdString(ied.name));
 
   setPosition(m_dtc->iedPosition(m_iedEntityId));
 
-  m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce()));
-  m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger());
-  m_ui->lblTriggerButton->setEnabled(ied.switchTrigger());
-  m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger());
-  m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger());
+  m_ui->lblExplosiveForce->setText(QString::number(ied.explosiveForce));
+  m_ui->lblTriggerRemote->setEnabled(ied.remoteTrigger);
+  m_ui->lblTriggerButton->setEnabled(ied.switchTrigger);
+  m_ui->lblTriggerLightbarrier->setEnabled(ied.lightBarrierTrigger);
+  m_ui->lblTriggerWire->setEnabled(ied.tautWireTrigger);
 
-  if (ied.pyrotechnics())
+  if (ied.pyrotechnics)
     m_ui->lblPyrotechnics->setText(tr("Active"));
   else
     m_ui->lblPyrotechnics->setText(tr("Inactive"));
 
-  m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState()));
+  m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState));
 
   m_ui->tbwBit->setRowCount(0);
-  if (ied.electronicsError().underlying() != IedError::NoError)
+  if (ied.electronicsError != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Electronics"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics1Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics1Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 1"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics2Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics2Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 2"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error));
     addTbwBitEntry(device, error);
   }
-  if (ied.pyrotechnics3Error().underlying() != IedError::NoError)
+  if (ied.pyrotechnics3Error != IedError::NoError)
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 3"));
-    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error()));
+    QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error));
     addTbwBitEntry(device, error);
   }
 
-  if ((ied.electronicsError().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics1Error().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics2Error().underlying() == IedError::NoError) &&
-      (ied.pyrotechnics3Error().underlying() == IedError::NoError))
+  if ((ied.electronicsError == IedError::NoError) &&
+      (ied.pyrotechnics1Error == IedError::NoError) &&
+      (ied.pyrotechnics2Error == IedError::NoError) &&
+      (ied.pyrotechnics3Error == IedError::NoError))
   {
     QTableWidgetItem *device = new QTableWidgetItem(tr("no Errors"));
     addTbwBitEntry(device, nullptr);
   }
 
-  const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId()).color()));
-  const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId()).role());
-  updateIcon(color, role, ied.tacticalState(), QString::fromStdString(ied.symbol()));
+  const QColor &color = QColor::fromRgb(QRgb(m_ppmDtc->party(ied.partyId).color));
+  const AdvancedSymbology::Role &role = AdvancedSymbology::roleToRole<>(m_ppmDtc->party(ied.partyId).role);
+  updateIcon(color, role, ied.tacticalState, QString::fromStdString(ied.symbol));
 }
 
 void InfoDialog::setPosition(const IedPosition &pos)
 {
-  if (std::isnan(pos.position().lon()) || std::isnan(pos.position().lat()))
+  if (std::isnan(pos.position.lon) || std::isnan(pos.position.lat))
     m_ui->lblPosition->setText(tr("Invalid Position"));
   else
-    m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position().lon(), pos.position().lat()));
+    m_ui->lblPosition->setText(LtsCoordTrans::mgrsFromGeographic(pos.position.lon, pos.position.lat));
 }
 
 
 AdvancedSymbology::Injury guezIedStateToInjury(const GuezIedManagement::IedTacticalState &iedState)
 {
-  switch (iedState.underlying())
+  switch (iedState)
   {
   case GuezIedManagement::IedTacticalState::Active:
     return AdvancedSymbology::Injury::NoInjury;          
@@ -170,7 +171,7 @@ void updateIedPyro(const GuezIedManagement::IedTacticalState &iedStateIn,
   if (injuryInOut != AdvancedSymbology::Injury::TotalKill)
     return;
 
-  switch (iedStateIn.underlying())
+  switch (iedStateIn)
   {
   case GuezIedManagement::IedTacticalState::Unknown:
   case GuezIedManagement::IedTacticalState::NotActive:
@@ -231,7 +232,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
 {
   Q_UNUSED(modType);
 
-  if (data.id() != m_iedEntityId)
+  if (data.id != m_iedEntityId)
     return;
 
   showIedInfos();
@@ -239,7 +240,7 @@ void InfoDialog::onIedChanged(const Ied &data, DataModification modType)
 
 void InfoDialog::onIedPositionChanged(const IedPosition &data, DataModification modType)
 {
-  if (data.id() != m_iedEntityId || modType == DataModification::eRemoved)
+  if (data.id != m_iedEntityId || modType == DataModification::eRemoved)
     return;
 
   setPosition(data);

qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp

@@ -30,6 +30,7 @@ PairingEditDialog::PairingEditDialog(LtsSession::LtsSession *session, QWidget *p
   , m_ppmGuiCbxIfc(nullptr)
   , m_participantModel(nullptr)
   , m_requestHelper(new LtsUtils::RequestHelper(this))
+  , m_logger(getLogger("GuezIedManangementPairingEditDialog"))
 {
   m_ui->setupUi(this);
   m_uiRequirements->addRequirement({m_ui->lblPairingState,  [this]() { return applyPairingStateCheck(); }});
@@ -102,13 +103,13 @@ void PairingEditDialog::onIedSelected(int idx)
 
   Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
   setUnchangeable(true);
-  m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(ied.pairingState().underlying())));
+  m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(static_cast<int>(ied.pairingState))));
 
   m_ui->treeViewParticipants->clearSelection();
-  if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
+  if (ied.pairingState == IedPairingState::PairedToParticipant)
   {
-    m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId().get()).partyId()));
-    m_participantModel->selectItemByParticipantId(ied.pairedParticipantId().get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
+    m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId.get()).partyId));
+    m_participantModel->selectItemByParticipantId(ied.pairedParticipantId.get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);});
   }
   setUnchangeable(false);
   enDisableUiElements();
@@ -135,10 +136,10 @@ void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
   if (checkSelectedParticipantType())
   {
     Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
-    if (ied.pairingState() == IedPairingState::PairedToParticipant)
+    if (ied.pairingState == IedPairingState::PairedToParticipant)
     {
       
-      if (m_participantModel->getParticipantData(idx).id() != ied.pairedParticipantId().get())
+      if (m_participantModel->getParticipantData(idx).id != ied.pairedParticipantId.get())
         slotChangesMade();
     }
     else
@@ -159,10 +160,10 @@ bool PairingEditDialog::apply()
   {
     PairIedRequest request;
 
-    request.id(m_ui->cbxIed->currentData().toInt());
-    request.pairingState(static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()));
-    if (request.pairingState().underlying() == IedPairingState::PairedToParticipant)
-      request.pairedParticipantId(dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id()));
+    request.id = m_ui->cbxIed->currentData().toInt();
+    request.pairingState = static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt());
+    if (request.pairingState == IedPairingState::PairedToParticipant)
+      request.pairedParticipantId = dds::core::optional<int32_t>(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id);
 
     return m_requestHelper->startSingleRequest([=]()
     {
@@ -177,7 +178,7 @@ bool PairingEditDialog::applyPairingStateCheck()
   Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
 
   
-  if (ied.pairingState() == IedPairingState::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying())
+  if (ied.pairingState == IedPairingState::NotPaired && static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == ied.pairingState)
       return false;
 
   return true;
@@ -186,15 +187,15 @@ bool PairingEditDialog::applyPairingStateCheck()
 bool PairingEditDialog::applyParticipantSelectionCheck()
 {
   
-  if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::PairedToParticipant)
+  if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::PairedToParticipant)
   {
     Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
-    if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant)
+    if (ied.pairingState == IedPairingState::PairedToParticipant)
     {
       if (checkSelectedParticipantType())
       {
         
-        if (ied.pairedParticipantId() == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id())
+        if (ied.pairedParticipantId == m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id)
           return false;
         
         return true;
@@ -208,9 +209,9 @@ bool PairingEditDialog::applyParticipantSelectionCheck()
 
 bool PairingEditDialog::checkSelectedParticipantType()
 {
-  ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId());
-  return ((type.typeClass().underlying() != ParticipantManagement::TypeClass::SupportUnit) &&
-          (type.typeClass().underlying() != ParticipantManagement::TypeClass::Unit));
+  ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId);
+  return ((type.typeClass != ParticipantManagement::TypeClass::SupportUnit) &&
+          (type.typeClass != ParticipantManagement::TypeClass::Unit));
 }
 
 void PairingEditDialog::fillIedCbx()
@@ -220,7 +221,7 @@ void PairingEditDialog::fillIedCbx()
   m_ui->cbxIed->clear();
   const QMap <qint32, GuezIedManagement::Ied> mapIed = m_dtc->ieds();
   for (auto it = mapIed.begin(); it != mapIed.end(); ++it)
-    m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber()), QVariant(it.value().id()));
+    m_ui->cbxIed->addItem(QString::number(it.value().equipmentNumber), QVariant(it.value().id));
 
   if (curIdxIed >= 0)
     m_ui->cbxIed->setCurrentIndex(curIdxIed);
@@ -231,8 +232,8 @@ void PairingEditDialog::fillIedCbx()
 void PairingEditDialog::fillPairingState()
 {
   m_ui->cbxPairingState->clear();
-  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired).underlying()), IedPairingState::NotPaired);
-  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant).underlying()), IedPairingState::PairedToParticipant);
+  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired)), static_cast<int>(IedPairingState::NotPaired));
+  m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant)), static_cast<int>(IedPairingState::PairedToParticipant));
 }
 
 void PairingEditDialog::fillPartyCbx()
@@ -254,7 +255,7 @@ void PairingEditDialog::enDisableUiElements()
   m_ui->cbxIed->setEnabled(m_ui->cbxIed->count() > 1);
   m_ui->cbxPairingState->setEnabled(m_ui->cbxIed->count() > 0 && m_participantModel->rowCount() > 0);
 
-  if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::NotPaired)
+  if (static_cast<IedPairingState>(m_ui->cbxPairingState->currentData().toInt()) == IedPairingState::NotPaired)
   {
     m_ui->cbxParty->setEnabled(false);
     m_ui->treeViewParticipants->setEnabled(false);

qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.h

@@ -7,6 +7,7 @@
 #include <GuezIedManagement/gim_ftc.h>
 #include <GuezIedManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_dialog.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/gim_data_plugin_interface.h

@@ -4,10 +4,8 @@
 #pragma once
 
 #include <PluginInterfaces/data_plugin_interface.h>
-#ifdef BUILD_WITH_EXTERNAL_DDS
 #include <GuezIedManagement/gim_dtc.h>
 #include <GuezIedManagement/gim_ftc.h>
-#endif
 
 namespace GuezIedManagement
 {
@@ -18,10 +16,8 @@ class DataInterface : public DataPluginBase::Interface
 public:
   using DataPluginBase::Interface::Interface;
 
-#ifdef BUILD_WITH_EXTERNAL_DDS
   virtual std::shared_ptr<GuezIedManagement::Interface::Dtc> getDtc() = 0;
   virtual std::shared_ptr<GuezIedManagement::Interface::Ftc> getFtc() = 0;
-#endif
 };
 
 }