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/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_list.cpp

@@ -21,7 +21,7 @@ namespace AreaEffectSimulation
 
 ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr), m_sourceModel(nullptr),
-      m_session(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::ChargeAdministrationList)
+      m_session(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::ChargeAdministrationList), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_adler_model.cpp

@@ -48,7 +48,7 @@ void ChargeAdministrationAdlerSortFilterProxyModel::setParty(int party)
 ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<ChargeAdministrationAdler>(
           {tr("Id"), tr("Charge Type Id"), tr("Changed"), tr("Charge Type Name"), tr("Total Stock"), tr("Gear Class")},
-          parent)
+          parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -78,7 +78,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession* session)
 
     for (const ParticipantManagement::Party& p : std::as_const(parties))
     {
-        updateItem(p.id());
+        updateItem(p.id);
     }
 
     connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::dynamicParticipantDataChanged, this,
@@ -99,7 +99,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
             DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
             updateParticipantChargeTypeMap(data);
 
-            updateItem(m_ppmDtc->participant(data.participantId()).partyId());
+            updateItem(m_ppmDtc->participant(data.participantId).partyId);
             break;
         }
         case DataModification::eRemoved: {
@@ -112,10 +112,10 @@ void ChargeAdministrationAdlerModel::onParticipantChanged(const ParticipantManag
                                                           DataModification modType)
 {
     Q_UNUSED(modType)
-    qint32 typeId = data.typeId();
-    qint32 participantId = data.id();
+    qint32 typeId = data.typeId;
+    qint32 participantId = data.id;
 
-    if (!data.isDeleted() || (!m_ppmDtc->isAdlerType(typeId) && (m_ppmDtc->type(typeId).typeClass().underlying() !=
+    if (!data.isDeleted || (!m_ppmDtc->isAdlerType(typeId) && (m_ppmDtc->type(typeId).typeClass !=
                                                                  ParticipantManagement::TypeClass::Unit)))
         return;
 
@@ -133,39 +133,39 @@ void ChargeAdministrationAdlerModel::onParticipantChanged(const ParticipantManag
         m_participantChargeTypeMap.remove(participantId);
     }
 
-    updateItem(data.partyId());
+    updateItem(data.partyId);
 }
 
 void ChargeAdministrationAdlerModel::updateParticipantChargeTypeMap(
     const ParticipantManagement::DynamicParticipantData& data)
 {
-    qint32 participantId = data.participantId();
-    qint64 sampleTime = data.sampleTime();
-    qint32 typeId = m_ppmDtc->participant(participantId).typeId();
-    bool isDeleted = m_ppmDtc->participant(participantId).isDeleted();
+    qint32 participantId = data.participantId;
+    qint64 sampleTime = data.sampleTime;
+    qint32 typeId = m_ppmDtc->participant(participantId).typeId;
+    bool isDeleted = m_ppmDtc->participant(participantId).isDeleted;
 
     if (isDeleted || (!m_ppmDtc->isAdlerType(typeId) &&
-                      (m_ppmDtc->type(typeId).typeClass().underlying() != ParticipantManagement::TypeClass::Unit)))
+                      (m_ppmDtc->type(typeId).typeClass != ParticipantManagement::TypeClass::Unit)))
         return;
 
     QMap<qint32, GearData> chargeTypeGearData;
-    for (const ParticipantManagement::GearInformation& ct : data.gear())
+    for (const ParticipantManagement::GearInformation& ct : data.gear)
     {
-        if (m_pdmDtc->adlerChargeTypeName(ct.chargeTypeId()).isEmpty())
+        if (m_pdmDtc->adlerChargeTypeName(ct.chargeTypeId).isEmpty())
             continue;
 
         GearData gearData;
-        gearData.remain = ct.remain();
-        gearData.lastUpdate = ct.lastUpdate();
-        if (chargeTypeGearData.contains(ct.chargeTypeId()))
+        gearData.remain = ct.remain;
+        gearData.lastUpdate = ct.lastUpdate;
+        if (chargeTypeGearData.contains(ct.chargeTypeId))
         {
-            gearData.remain += chargeTypeGearData.value(ct.chargeTypeId()).remain;
+            gearData.remain += chargeTypeGearData.value(ct.chargeTypeId).remain;
         }
-        chargeTypeGearData.insert(ct.chargeTypeId(), gearData);
+        chargeTypeGearData.insert(ct.chargeTypeId, gearData);
     }
     m_participantChargeTypeMap.insert(
         participantId,
-        ChargeStruct(participantId, m_ppmDtc->participant(participantId).partyId(), sampleTime, chargeTypeGearData));
+        ChargeStruct(participantId, m_ppmDtc->participant(participantId).partyId, sampleTime, chargeTypeGearData));
 }
 
 void ChargeAdministrationAdlerModel::updateItem(int partyId)

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_gui_plugin.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 
 namespace AreaEffectSimulation
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_list.cpp

@@ -25,7 +25,7 @@ namespace AreaEffectSimulation
 ChargeAdministrationList::ChargeAdministrationList(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_model(nullptr), m_sourceModel(nullptr),
       m_session(nullptr), m_ftc(nullptr), m_requestHelper(new LtsUtils::RequestHelper(this)),
-      m_ui(new Ui::ChargeAdministrationList)
+      m_ui(new Ui::ChargeAdministrationList), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -154,15 +154,15 @@ void ChargeAdministrationList::onEditCharge()
 {
     ChargeAdministration item = m_sourceModel->getRowData(m_ui->widget->currentIndex().row());
 
-    if (item.id() < 0)
+    if (item.id < 0)
         return;
 
-    ProjectDataManagement::ChargeType ct = m_sourceModel->chargeType(item.chargeTypeId());
+    ProjectDataManagement::ChargeType ct = m_sourceModel->chargeType(item.chargeTypeId);
 
     const QModelIndex temp = m_ui->widget->currentIndex();
 
     const QModelIndex mi = temp.sibling(temp.row(), ChargeAdministrationModel::ColTypeName);
-    auto ce = new ChargeEdit(ct.id(), m_sourceModel->data(mi).toString(), item.amount(), this);
+    auto ce = new ChargeEdit(ct.id, m_sourceModel->data(mi).toString(), item.amount, this);
     connect(ce, &ChargeEdit::newStock, this, &ChargeAdministrationList::onChargeEditFinished);
     connect(ce, &ChargeEdit::newStock, ce, &ChargeEdit::deleteLater);
     ce->show();
@@ -172,16 +172,16 @@ void ChargeAdministrationList::onChargeEditFinished(int chargeId, int newStock)
 {
     ChargeAdministration item = m_sourceModel->getRowData(m_ui->widget->currentIndex().row());
 
-    if (item.chargeTypeId() != chargeId)
+    if (item.chargeTypeId != chargeId)
         return;
 
-    if (item.amount() == newStock)
+    if (item.amount == newStock)
         return;
-    item.amount(newStock);
+    item.amount = newStock;
 
     bool amountChangedByOperator = true;
-    const ChargeAdministrationModifyRequest req(item.id(), item.chargeTypeId(), item.partyId(), item.effectSourceId(),
-                                                item.amount(), amountChangedByOperator);
+    const ChargeAdministrationModifyRequest req(item.id, item.chargeTypeId, item.partyId, item.effectSourceId,
+                                                item.amount, amountChangedByOperator);
 
     m_requestHelper->addRequest([this, req]() { return m_ftc->chargeAdministrationModifyRequest(req, this); });
     m_requestHelper->startRequests();

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp

@@ -28,7 +28,7 @@ bool ChargeAdministrationSortFilterProxyModel::filterAcceptsRow(int source_row,
         return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 
     const ChargeAdministration& item = m_sourceModel->m_vecData.at(source_row);
-    if (item.partyId() != m_party)
+    if (item.partyId != m_party)
         return false;
     return LtsWidgets::LtsColumnFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
@@ -49,7 +49,7 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject* parent)
     : LtsWidgets::LtsAbstractTableModel<ChargeAdministration>({tr("Id"), tr("Charge Type Id"), tr("Changed"),
                                                                tr("Charge Type Name"), tr("Total Stock"), tr("Planned"),
                                                                tr("Available"), tr("Used"), tr("Gear Class")},
-                                                              parent)
+                                                              parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }
 
@@ -80,12 +80,12 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
 
     QVector<QPair<int, int>> chargesInserted;
     auto cb = [this, &chargesInserted](const ChargeAdministration& item) {
-        const int chargeTypeId = item.chargeTypeId();
+        const int chargeTypeId = item.chargeTypeId;
         if (m_pdmDtc->isAdlerChargeType(chargeTypeId))
             return;
 
         insertRow(item);
-        chargesInserted.append(qMakePair<int, int>(item.chargeTypeId(), item.partyId()));
+        chargesInserted.append(QPair<int, int>(item.chargeTypeId, item.partyId));
     };
     m_aesDtc->chargeAdministrations(cb);
 
@@ -98,22 +98,22 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
     }
 
     QVector<ProjectDataManagement::ChargeType> chargesForGearClass =
-        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Artillery) +
-        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Mortar);
+        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Artillery) +
+        m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Mortar);
 
     LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance();
     const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
     if (enableRocket)
-        chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Rocket);
+        chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::GearClass_Rocket);
     for (const ParticipantManagement::Party& p : std::as_const(parties))
     {
         for (const ProjectDataManagement::ChargeType& ct : std::as_const(chargesForGearClass))
         {
-            if (chargesInserted.contains(qMakePair(ct.id(), p.id())) || isDummy(ct) ||
-                m_pdmDtc->isAdlerChargeType(ct.id()))
+            if (chargesInserted.contains(qMakePair(ct.id, p.id)) || isDummy(ct) ||
+                m_pdmDtc->isAdlerChargeType(ct.id))
                 continue;
 
-            reqs << ChargeAdministrationModifyRequest(0, ct.id(), p.id(),
+            reqs << ChargeAdministrationModifyRequest(0, ct.id, p.id,
                                                       ProjectDataManagement::EffectSource::ES_Internal, 0, true);
         }
     }
@@ -122,7 +122,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session,
 
 bool ChargeAdministrationModel::isDummy(const ProjectDataManagement::ChargeType& ct)
 {
-    return LtsUtils::JsonObject::fromJson(ct.properties()).valueOr<bool>("isDummy", false);
+    return LtsUtils::JsonObject::fromJson(ct.properties).valueOr<bool>("isDummy", false);
 }
 
 QVariant ChargeAdministrationModel::data(const QModelIndex& index, int role) const
@@ -135,23 +135,23 @@ QVariant ChargeAdministrationModel::data(const QModelIndex& index, int role) con
     switch (index.column())
     {
         case ColId:
-            return item.id();
+            return item.id;
         case ColTypeId:
-            return item.chargeTypeId();
+            return item.chargeTypeId;
         case ColChanged:
-            return QDateTime::fromMSecsSinceEpoch(item.sampleTime());
+            return QDateTime::fromMSecsSinceEpoch(item.sampleTime);
         case ColTypeName:
-            return m_pdmDtc->trChargeTypeShortName(item.chargeTypeId(), true);
+            return m_pdmDtc->trChargeTypeShortName(item.chargeTypeId, true);
         case ColStock:
-            return item.amount();
+            return item.amount;
         case ColAvailable:
-            return item.amount() - item.planned();
+            return item.amount - item.planned;
         case ColPlanned:
-            return item.planned();
+            return item.planned;
         case ColUsed:
-            return item.used();
+            return item.used;
         case ColGearClass:
-            return ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(item.chargeTypeId()));
+            return ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(item.chargeTypeId));
     }
     return QVariant();
 }
@@ -160,7 +160,7 @@ void ChargeAdministrationModel::onChargeAdministrationChanged(const ChargeAdmini
                                                               DataModification modType)
 {
 
-    if (m_pdmDtc->isAdlerChargeType(data.chargeTypeId()))
+    if (m_pdmDtc->isAdlerChargeType(data.chargeTypeId))
         return;
     onDataChanged(data, modType);
 }