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/AdvancedSymbology/Data/asb_data_plugin.cpp

@@ -17,7 +17,7 @@ namespace AdvancedSymbology
 AdvancedSymbology::SidcDefinitions::Identity roleToIdentity(const ParticipantManagement::Role role)
 {
   AdvancedSymbology::SidcDefinitions::Identity identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
-  switch (role.underlying()) {
+  switch (role) {
   case ParticipantManagement::Role::Unknown:
     identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
     break;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp

@@ -6,7 +6,7 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include "AreaEffectSimulation/aes_dtc.h"
-#include "ParticipantManagement/ppm.hpp"
+#include "ParticipantManagement/ppm_dtc.h"
 #endif
 #include "Symbology/symbol_data_to_render_role.h"
 #include "SymbologyImpl/advanced_symbology_logging.h"
@@ -18,6 +18,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantMana
                                            const std::shared_ptr<AreaEffectSimulation::Interface::Dtc>& aesDtc,
                                            const std::shared_ptr<GuezIedManagement::Interface::Dtc>& guezIedDtc)
     : m_ppmDtc(ppmDtc), m_aesDtc(aesDtc), m_guezIedDtc(guezIedDtc)
+    , m_logger(getLogger("AdvancedSymbologyPlugin"))
 {
     if (!m_ppmDtc)
     {
@@ -53,100 +54,100 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const SymbolDataToR
 QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantManagement::Participant& participant,
                                                              int sizeL, const QColor& desiredColor) const
 {
-    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol()), sizeL);
+    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol), sizeL);
 
     if (!m_ppmDtc)
         return findImage(symDataToRender);
 
-    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId());
-    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role());
+    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId);
+    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role);
 
-    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color()));
+    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color));
     symDataToRender.fillColorReplace = true;
 
     QColor injuryColor = QColor(100, 100, 0);
     ProjectDataManagement::VulnerabilityState currentState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 
-    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id());
+    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id);
 
-    if (dData.stateHistory().size())
+    if (dData.stateHistory.size())
     {
         const ParticipantManagement::StateInformation& lastState =
-            m_ppmDtc->youngestStateInformation(dData.stateHistory());
-        currentState = lastState.vulnerabilityState();
+            m_ppmDtc->youngestStateInformation(dData.stateHistory);
+        currentState = lastState.vulnerabilityState;
 
-        switch (lastState.originatorType().underlying())
+        switch (lastState.originatorType)
         {
-            case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice: {
                 if (m_guezIedDtc)
                 {
-                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId());
-                    if (gIed.id() > 0)
+                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId);
+                    if (gIed.id > 0)
                     {
-                        int injuryPartyId = gIed.partyId();
+                        int injuryPartyId = gIed.partyId;
                         if (injuryPartyId >= 0)
-                            injuryColor = m_ppmDtc->party(injuryPartyId).color();
+                            injuryColor = m_ppmDtc->party(injuryPartyId).color;
                     }
                 }
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::DusMine: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
-                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId());
+                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId);
                 if (partyId >= 0)
-                    injuryColor = m_ppmDtc->party(partyId).color();
+                    injuryColor = m_ppmDtc->party(partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-            case ProjectDataManagement::StateChangeOriginator::FunctionalArea: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
 
                 AreaEffectSimulation::AesItem aesItem;
-                m_aesDtc->aesItemFromId(lastState.originatorId(), aesItem);
+                m_aesDtc->aesItemFromId(lastState.originatorId, aesItem);
 
-                if (aesItem.partyId().is_set())
-                    injuryColor = m_ppmDtc->party(aesItem.partyId().get()).color();
+                if (aesItem.partyId.has_value())
+                    injuryColor = m_ppmDtc->party(aesItem.partyId.get()).color;
 
                 break;
             }
 
-            case ProjectDataManagement::StateChangeOriginator::Participant: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant: {
                 const ParticipantManagement::Participant& participantOrigin =
-                    m_ppmDtc->participant(lastState.originatorId());
+                    m_ppmDtc->participant(lastState.originatorId);
 
-                if (participantOrigin.id())
-                    injuryColor = m_ppmDtc->party(participantOrigin.partyId()).color();
+                if (participantOrigin.id)
+                    injuryColor = m_ppmDtc->party(participantOrigin.partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::Party: {
-                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId());
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party: {
+                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId);
 
-                if (partyOrigin.id())
-                    injuryColor = partyOrigin.color();
+                if (partyOrigin.id)
+                    injuryColor = partyOrigin.color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::ObserverController:
-            case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-            case ProjectDataManagement::StateChangeOriginator::Initialization:
-                injuryColor = m_ppmDtc->party(1).color();
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+                injuryColor = m_ppmDtc->party(1).color;
                 break;
-            case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-            case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-            case ProjectDataManagement::StateChangeOriginator::Sanitation:
-            case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-            case ProjectDataManagement::StateChangeOriginator::Unknown:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
                 break;
         }
     }
@@ -159,7 +160,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
 
 AdvancedSymbology::Injury ForeignInterfaceImpl::stateToInjury(const ProjectDataManagement::VulnerabilityState& state)
 {
-    switch (state.underlying())
+    switch (state)
     {
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp

@@ -70,10 +70,10 @@ void SaveAsSymbol::onInputChanged(const QString &input)
 
 void SaveAsSymbol::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+  if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
     return;
 
-  QString name = QString::fromStdString(data.name());
+  QString name = QString::fromStdString(data.name);
 
   if (modType == DataModification::eRemoved)
     m_takenNames.removeAll(name);

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h

@@ -19,7 +19,7 @@ class SelectTextDialog final : public LtsWidgets::LtsFramelessDialog
     ~SelectTextDialog();
 
   protected:
-    NGL::INGLLogger& m_logger;
+    //NGL::INGLLogger& m_logger;  // unused (legacy: commented out)
     Ui_SelectTextDialog* ui;
 
   private:

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp

@@ -125,7 +125,7 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent)
   : LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_ui(new Ui::SymbolEditor)
   , m_session(session)
-  .getNGLLogger("SymbolEditor"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SymbolEditor"))
 {
     DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")";
     m_ui->setupUi(this);
@@ -227,9 +227,9 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>& f
     m_internal->m_symbolColorsPreview.clear();
     m_internal->m_ppmDtc->partys([this](const ParticipantManagement::Party& data) {
         m_internal->m_symbolColorsPreview.append(
-            {ParticipantManagement::trPartyName(data.name()), QColor::fromRgb(data.color())});
-        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name())),
-                                                  QColor::fromRgb(data.fadingColor())});
+            {ParticipantManagement::trPartyName(data.name), QColor::fromRgb(data.color)});
+        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name)),
+                                                  QColor::fromRgb(data.fadingColor)});
     });
 
     m_internal->m_toolButtonGroup.addButton(m_ui->ToolButtonRect);
@@ -812,11 +812,9 @@ void SymbolEditor::updateSymbolAttributesWidgets()
     m_ui->ListViewMisc->clearSelection();
     m_ui->ListViewTruppengattung->clearSelection();
 
-    QLinkedList<SymbologyXML::Primitive*> primitives = m_internal->m_symbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(primitives);
-    while (pi.hasNext())
+    auto primitives = m_internal->m_symbol.getPrimitives();
+    for (auto* prim : primitives)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         int iconId = prim->icon();
         SymbologyXML::SymbolTypes::t_icon_type iconType = prim->iconType();
         SymbologyXML::SymbolTypes::t_sector_position sectorPosition = prim->position();
@@ -1445,7 +1443,7 @@ void SymbolEditor::slotImportTemplate()
         else
         {
             FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-            QString symbolName = QString::fromStdString(fc.name());
+            QString symbolName = QString::fromStdString(fc.name);
             SymbologyXML::SymbolReader sr;
             pushUndo();
             sr.read(content, m_internal->m_symbol);
@@ -1453,7 +1451,7 @@ void SymbolEditor::slotImportTemplate()
 
             m_internal->m_lastFileId = fileId;
             m_internal->m_lastFileName = symbolName;
-            m_internal->m_lastFolderId = fc.folderId();
+            m_internal->m_lastFolderId = fc.folderId;
 
             updateGUI();
             __unchange__();
@@ -1850,7 +1848,7 @@ void SymbolEditor::onToolButtonTextClicked()
 
 void SymbolEditor::resetToolButtonGroupState()
 {
-    m_ui->ToolButtonSelect->animateClick(1);
+    m_ui->ToolButtonSelect->animateClick();
 }
 
 void SymbolEditor::onPushButtonFillColorClicked()
@@ -1934,11 +1932,9 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol& tmpSymbol)
             m_internal->m_symbol.addBranch((SymbologyXML::SymbolTypes::t_branch)idx);
     }
 
-    QLinkedList<SymbologyXML::Primitive*> prims = tmpSymbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(prims);
-    while (pi.hasNext())
+    auto prims = tmpSymbol.getPrimitives();
+    for (auto* prim : prims)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         if ((prim->type() == SymbologyXML::Primitive::ICON) &&
             m_internal->m_symbol.containsPrimitive(prim->iconType(), prim->position(), prim->icon()))
             continue;
@@ -3016,8 +3012,8 @@ bool SymbolEditor::writeFile(bool saveAsNew)
         DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
         m_internal->m_lastFileId = fileId;
         FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-        m_internal->m_lastFolderId = fc.folderId();
-        const QString fileName = QString::fromStdString(fc.name());
+        m_internal->m_lastFolderId = fc.folderId;
+        const QString fileName = QString::fromStdString(fc.name);
         m_internal->m_lastFileName = fileName;
         m_internal->m_symbol.setName(fileName);
         bRet = true;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h

@@ -6,7 +6,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <NGLLogger/INGLLogger.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SymbologyXML/symbol_types.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h

@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <AdvancedSymbology/asb_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp

@@ -27,8 +27,8 @@ void FileManagementReplyHandler::requestReply(const Core::FunctionReplyObject &r
 
 void FileManagementReplyHandler::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply &replyObject)
 {
-  m_content = replyObject.content();
-  m_id = replyObject.id();
+  m_content = replyObject.content;
+  m_id = replyObject.id;
   m_requestHelper->requestReply(replyObject);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui

@@ -318,7 +318,7 @@
              <enum>Qt::ScrollBarAsNeeded</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>
@@ -576,7 +576,7 @@
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp

@@ -6,7 +6,7 @@
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <QtXml/QDomDocument>
 #include <QtGui/QImage>
@@ -152,7 +152,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 #ifdef SKIP_SOME_TO_TEST_REFETCHING
         if (fileContentId >= 98)
-            request.fileContentId(-1);
+            request.fileContentId = -1;
 #endif
 #endif
 
@@ -179,7 +179,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply& reply)
 {
-    const int32_t fileContentId = reply.id();
+    const int32_t fileContentId = reply.id;
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, " << fileContentId;
 
@@ -197,16 +197,16 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " fileContentId=" << fileContentId << " name=" << name
                         << " operatorName=" << operatorName << " lastModified=" << lastModified
-                        << " #bytes =" << reply.content().size();
+                        << " #bytes =" << reply.content.size();
 
-    fcData.monitoring.replyContentSize = reply.content().size();
+    fcData.monitoring.replyContentSize = reply.content.size();
 
     switch (fcData.type)
     {
         case FileContentStruct::SymbolType::EtsSymbol: {
             QImage image;
-            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)),
-                                                    reply.content().size()),
+            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content.at(0)),
+                                                    reply.content.size()),
                             image))
             {
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
@@ -225,7 +225,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
         case FileContentStruct::SymbolType::XmlSymbol: {
             FlmSymbolProxy::SymbolData symbolData(name, operatorName, lastModified,
-                                                  LtsUtils::toQByteArray(reply.content()));
+                                                  LtsUtils::toQByteArray(reply.content));
 
             if (symbolData.isXmlSymbol())
             {
@@ -277,7 +277,7 @@ bool FlmSubscriber::svgToImage(const QByteArray& svgByteArray, QImage& imageOut)
 QString FlmSubscriber::operatorName(int operatorId)
 {
     if (d->m_opmDtc)
-        return QString::fromStdString(d->m_opmDtc->user(operatorId).name());
+        return QString::fromStdString(d->m_opmDtc->user(operatorId).name);
     return QStringLiteral("unknown user<%1>").arg(operatorId);
 }
 
@@ -339,20 +339,20 @@ void FlmSubscriber::checkForReFetching()
 
 void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data, DataModification modType)
 {
-    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id()
-                        << " data.fileStatus=" << data.fileStatus().underlying() << " modType=" << modType
-                        << " data.name='" << data.name().c_str() << "'";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id
+                        << " data.fileStatus=" << data.fileStatus << " modType=" << modType
+                        << " data.name='" << data.name.c_str() << "'";
 
     if (!d->m_flmFtc)
         return;
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileType().underlying() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
     {
         switch (modType)
         {
@@ -367,7 +367,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
         }
     }
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
     switch (modType)
     {
         case DataModification::eAdded:
@@ -383,13 +383,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
 
         case DataModification::eRemoved: {
             DEBUG_LOG(m_logger) << Q_FUNC_INFO << " modType=" << modType << " fileContentId=" << fileContentId
-                                << " fileContentName=" << data.name();
+                                << " fileContentName=" << data.name;
 
             d->m_fileContentMap.remove(fileContentId);
 
             if (!d->m_symbolProxy.removeSymbol(fileContentId))
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " removeSymbol failed"
-                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name() << "'"
+                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name << "'"
                                     << " contains=" << d->m_fileContentMap.contains(fileContentId);
             break;
         }
@@ -400,35 +400,35 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
         return;
 
-    if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
 
     FileContentStruct fcData;
 
-    fcData.name = QString::fromStdString(data.name());
+    fcData.name = QString::fromStdString(data.name);
     fcData.type = FileContentStruct::SymbolType::UnsupportedSymbol;
-    fcData.operatorName = operatorName(data.operatorId());
-    fcData.lastModified = data.lastModified();
+    fcData.operatorName = operatorName(data.operatorId);
+    fcData.lastModified = data.lastModified;
 
     fcData.usrTags << QStringLiteral("file-id=%1").arg(fileContentId);
-    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId().is_set() ? data.exerciseId().get() : -1);
+    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId.has_value() ? data.exerciseId.get() : -1);
     fcData.usrTags << fcData.operatorName;
 
-    if (data.properties().size() != 0)
+    if (data.properties.size() != 0)
     {
-        const QByteArray attributesJson(QByteArray::fromRawData(data.properties().c_str(), data.properties().size()));
+        const QByteArray attributesJson(QByteArray::fromRawData(data.properties.c_str(), data.properties.size()));
         QJsonParseError parseError;
         QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
 
@@ -476,9 +476,9 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 }
 
 void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileContentId, const QString& name, const QImage& image,

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h

@@ -6,7 +6,7 @@
 #include <Lts/Services/FileManagement/flm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <memory>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp

@@ -10,7 +10,7 @@
 #include <Symbology/sidc_codec.h>
 #include "flm_symbol_proxy.h"
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
 namespace AdvancedSymbology

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h

@@ -9,6 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 #include <QtGui/QImage>
+#include <QtCore/QObject>