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/ReportManagement/Gui/ReportViewer/Input/rep_input_aes_model.cpp

@@ -33,7 +33,7 @@ bool ReportAesModel::initModel(int partyId)
 
   clear();
 
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportType::Nbc:
   {
@@ -47,12 +47,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -70,12 +70,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -100,12 +100,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -123,12 +123,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;
@@ -151,12 +151,12 @@ bool ReportAesModel::initModel(int partyId)
       entry.setId(cont.id());
       entry.chargeType = cont.chargeStruct().chargeTypeId();
       entry.name = QString::fromStdString(cont.name());
-      if (cont.effectStart().is_set())
+      if (cont.effectStart().has_value())
         entry.startTime = cont.effectStart().get();
       else
         entry.startTime = 0;
       entry.endTime = entry.startTime + cont.effectDuration();
-      if (cont.partyId().is_set())
+      if (cont.partyId().has_value())
         entry.partyId = cont.partyId().get();
       else
         entry.partyId = 0;

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_charge_model.cpp

@@ -74,7 +74,7 @@ bool ReportChargeModel::isFiltered(const ProjectDataManagement::ChargeType &data
 
 
   const ProjectDataManagement::GearClass gc = m_pdmDtc->gearClassFromChargeTypeId(data.id());
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportType::ChargeAdministration:
     return (gc != ProjectDataManagement::GearClass::GearClass_Artillery &&

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Input/rep_input_type_model.cpp

@@ -59,7 +59,7 @@ QVariant ReportTypeModel::data(const QModelIndex &index, int role) const
 bool ReportTypeModel::isFiltered(const ParticipantManagement::Type &data, DataModification) const
 {
   const auto tc = data.typeClass();
-  switch (m_reportType.underlying())
+  switch (m_reportType)
   {
   case ReportManagement::ReportType::VehicleRepair:
     return (tc != ParticipantManagement::TypeClass::GroundVehicle &&

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_abstract_model.cpp

@@ -25,7 +25,7 @@ using namespace ReportManagement;
 
 ReportManagement::AbstractModel *ReportManagement::AbstractModel::create(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent)
 {
-  switch (report.reportType().underlying())
+  switch (report.reportType())
   {
   case ReportType::UnitPower:
     return new UnitPowerModel(report, session, parent);

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp

@@ -116,7 +116,7 @@ QVariant ChargeAdministrationModel::data(const QModelIndex &index, int role) con
       case CHARGE_TYPE_ID:
         return (displayInfo.chargeTypeId > 0 ? displayInfo.chargeTypeId : QVariant());
       case EFFECT_SOURCE_ID:
-        return (displayInfo.effectSourceId.underlying() >= 0 ? ProjectDataManagement::toString(displayInfo.effectSourceId) : tr("Total:"));
+        return (displayInfo.effectSourceId >= 0 ? ProjectDataManagement::toString(displayInfo.effectSourceId) : tr("Total:"));
       case GEAR_CLASS:
         return (displayInfo.chargeTypeId > 0 ? ProjectDataManagement::toString(m_pdmDtc->gearClassFromChargeTypeId(displayInfo.chargeTypeId)) : QVariant());
       case CHARGE_TYPE_NAME:
@@ -222,7 +222,7 @@ void ChargeAdministrationModel::fillReportData()
 
         sumUp(bigTotal, totalEffectSource.charges, 6);
       }
-      effectSourceId = resData.effectSourceId.underlying();
+      effectSourceId = resData.effectSourceId;
       std::fill(std::begin(sums), std::end(sums), 0);
     }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_resupply_model.h

@@ -7,6 +7,7 @@
 #include <ReportManagement/logger.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.cpp

@@ -2,6 +2,7 @@
 
 
 #include "rep_maintenance_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_maintenance_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_mine_area_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_nbc_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_participant_distance_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 
 namespace ReportManagement

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp

@@ -2,6 +2,7 @@
 
 
 #include "rep_treatment_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -577,21 +578,21 @@ void TreatmentModel::fillReportData()
     QMap<int,QSet<int>> tmpVulMap = it.value();
 
     
-    resDataTable.amountLightlyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage).size();
+    resDataTable.amountLightlyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage).size();
     resDataTotal.amountLightlyWounded += resDataTable.amountLightlyWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage))
       INFO_LOG(m_logger) << "participantId: lightlyWouned: " << id;
 
     
-    resDataTable.amountMediumWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage).size();
+    resDataTable.amountMediumWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage).size();
     resDataTotal.amountMediumWounded += resDataTable.amountMediumWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage))
       INFO_LOG(m_logger) << "participantId: mediumWouned: " << id;
 
     
-    resDataTable.amountHeavyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage).size();
+    resDataTable.amountHeavyWounded  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage).size();
     resDataTotal.amountHeavyWounded += resDataTable.amountHeavyWounded;
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage))
       INFO_LOG(m_logger) << "participantId: heavyWouned: " << id;
 
     
@@ -600,11 +601,11 @@ void TreatmentModel::fillReportData()
     resDataTotal.amountInjuryTotal += resDataTable.amountInjuryTotal;
 
     
-    resDataTable.amountKIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill).size();
+    resDataTable.amountKIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill).size();
     resDataTotal.amountKIA += resDataTable.amountKIA;    
 
     
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill))
     {
       INFO_LOG(m_logger) << "participantId: KIA: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
@@ -612,10 +613,10 @@ void TreatmentModel::fillReportData()
     }
 
     
-    resDataTable.amountKIAAfterWIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance).size();
+    resDataTable.amountKIAAfterWIA  = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance).size();
     resDataTotal.amountKIAAfterWIA += resDataTable.amountKIAAfterWIA;
     
-    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance))
+    for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance))
     {
       INFO_LOG(m_logger) << "participantId: kiaAfterWia: " << id;
       m_rescueStationTreated[resDataTable.participantId].remove(id);
@@ -762,12 +763,12 @@ void TreatmentModel::fillParticipantMap()
     QMap<int,QSet<int>> vulnMap;
     QSet<int> partIds;
 
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::LightDamage,      partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::MediumDamage,     partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::HeavyDamage,      partIds);
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::CatastrophicKill, partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage,      partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage,     partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage,      partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, partIds);
     
-    vulnMap.insert(ProjectDataManagement::VulnerabilityState::TemporarySeverance, partIds);
+    vulnMap.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance, partIds);
 
     m_vulnerabilityMap.insert(it2.key(), vulnMap);
     m_rescueStationTreated.insert(it2.key(), partIds);
@@ -820,9 +821,9 @@ int TreatmentModel::getParticipantKey(int participantId)
 void TreatmentModel::countVulnerabilityState( int key, const resultData &data)
 {
   
-  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady ||
-      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage ||
-      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged)
+  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ||
+      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage ||
+      data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged)
     return;
 
   if ( key <= 0)
@@ -859,11 +860,11 @@ void TreatmentModel::countVulnerabilityState( int key, const resultData &data)
     }
   }
 
-  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill && data.kiaAfterWia)
+  if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill && data.kiaAfterWia)
   {
-    vulMapTemp[ProjectDataManagement::VulnerabilityState::CatastrophicKill].remove(data.participantId);
+    vulMapTemp[ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill].remove(data.participantId);
     
-    vulMapTemp[ProjectDataManagement::VulnerabilityState::TemporarySeverance].insert(data.participantId);
+    vulMapTemp[ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance].insert(data.participantId);
   }
 
   m_vulnerabilityMap[key] = vulMapTemp;

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp

@@ -2,6 +2,7 @@
 
 
 #include "rep_treatment_timeline_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <PluginInterfaces/gui_plugin_interface.h>
@@ -248,7 +249,7 @@ QVariant TreatmentTimelineModel::data(const QModelIndex &index, int role) const
     else if (role == Qt::UserRole + 1)
     {
       if (m_report.visualisationType() == VisualisationType::Line)
-        return displayInfo.eventTypeId.underlying();
+        return displayInfo.eventTypeId;
     }
   }
 
@@ -356,7 +357,7 @@ QString TreatmentTimelineModel::getAreaName(const QString& properties) const
 QColor TreatmentTimelineModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
   DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
   case ReportManagement::EventType::VitalityChanged:     return QColor(Qt::green);

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp

@@ -2,6 +2,7 @@
 
 
 #include "rep_unit_power_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <utility>
 
 #include <ProjectDataManagement/pdm_to_string.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.h

@@ -6,6 +6,7 @@
 #include "rep_abstract_model.h"
 #include <ReportManagement/logger.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace ReportManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp

@@ -164,7 +164,7 @@ void ReportEdit::retranslate()
 {
   QString title;
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::UnitPower:
       title = tr("Unit Power");
@@ -222,7 +222,7 @@ void ReportEdit::retranslate()
       break;
   }
   if (title.isEmpty())
-    title = tr("Unknown (%1)").arg(m_report.reportType().underlying());
+    title = tr("Unknown (%1)").arg(m_report.reportType());
   translate(m_ui, m_report, tr("%1 Report").arg(title));
 
   if (m_useCharge)
@@ -268,7 +268,7 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess
     for (const ProjectDataManagement::EffectSource &es : effects)
     {
       QAction *action = effectSourceMenu->addAction(ProjectDataManagement::toString(es));
-      action->setData(es.underlying());
+      action->setData(es);
       action->setCheckable(true);
       action->setChecked(false);
       connect(action,
@@ -352,7 +352,7 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess
 
   __unchange__();
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::UnitPower:
       setOnlineHelpFilename(QStringLiteral("Situation-Add_Combat_Report"));
@@ -496,7 +496,7 @@ bool ReportEdit::initInputs()
   
   m_ui->gbArea->setVisible(false);
 
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
     case ReportType::ParticipantDistance:
     {
@@ -1022,7 +1022,7 @@ bool ReportEdit::initInputs()
                 m_ui->treeViewAdditionalItems->clearSelection();
             });
     
-    if (m_report.reportType().underlying() == ReportType::ExplosiveDevice)
+    if (m_report.reportType() == ReportType::ExplosiveDevice)
     {
       m_ui->cbAllAdditionalItems->setChecked(true);
       m_ui->treeViewAdditionalItems->selectAll();
@@ -1085,7 +1085,7 @@ bool ReportEdit::initInputs()
     for (QAction *action : m_ui->pbEffectSource->menu()->actions())
     {
       const ProjectDataManagement::EffectSource effectSourceId = static_cast<ProjectDataManagement::EffectSource>(action->data().toInt());
-      auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId.underlying());
+      auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId);
       if (it != m_report.effectSources().end())
       {
         DEBUG_LOG(m_logger) << "To be checked: effectSourceId: " << effectSourceId;
@@ -1688,7 +1688,7 @@ void ReportEdit::onAesChanged(const AreaEffectSimulation::AesItemView &data, Dat
 
 void ReportEdit::onCreateModifyReportReply(const CreateModifyReportReply &replyObject)
 {
-  switch (replyObject.replyState().underlying())
+  switch (replyObject.replyState())
   {
     case Core::FtReplyState::InProgress:
       DEBUG_LOG(m_logger) << "onCreateModifyReportReply InProgress";

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_model.cpp

@@ -14,11 +14,11 @@ namespace core
 {
 static inline uint qHash(const ReportManagement::ReportType &t, uint seed)
 {
-  return ::qHash(t.underlying(), seed);
+  return ::qHash(t, seed);
 }
 static inline uint qHash(const ReportManagement::VisualisationType &t, uint seed)
 {
-  return ::qHash(t.underlying(), seed);
+  return ::qHash(t, seed);
 }
 }
 }
@@ -106,11 +106,11 @@ QVariant ReportModel::data(const QModelIndex &index, int role) const
     switch (index.column())
     {
     case Type:
-      return reportInfo.reportType().underlying();
+      return reportInfo.reportType();
     case Party:
       return reportInfo.partyId();
     case Visualisation:
-      return reportInfo.visualisationType().underlying();
+      return reportInfo.visualisationType();
     default:
       break;
     }
@@ -197,7 +197,7 @@ void ReportModel::updateComboboxFilterData(const QSet<ReportType> &availableRepo
   LtsWidgets::ComboboxFilterData cfd;
   for (const auto &i : std::as_const(availableReportTypes))
   {
-    cfd.data = i.underlying();
+    cfd.data = i;
     cfd.text = ReportManagement::toString(i);
     cfc.data.push_back(cfd);
   }
@@ -207,7 +207,7 @@ void ReportModel::updateComboboxFilterData(const QSet<ReportType> &availableRepo
   cfc.data.clear();
   for (const auto &i : std::as_const(availableVisualisationTypes))
   {
-    cfd.data = i.underlying();
+    cfd.data = i;
     cfd.text = ReportManagement::toString(i);
     cfc.data.push_back(cfd);
   }

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp

@@ -44,7 +44,7 @@
 #include <ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <InfrastructureManagement/ism_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -164,7 +164,7 @@ bool ReportPreview::displayReport()
     addMessage(tr("No data available"));
 
   
-  switch (m_report.visualisationType().underlying())
+  switch (m_report.visualisationType())
   {
   case VisualisationType::Line:
     displayReportAsLine();
@@ -180,7 +180,7 @@ bool ReportPreview::displayReport()
     break;
   default:
     ERROR_LOG(m_logger) << "Unknown visualisation type for report id = " << m_report.id()
-                        << ": " << m_report.visualisationType().underlying();
+                        << ": " << m_report.visualisationType();
     return false;
   }
 
@@ -681,7 +681,7 @@ void ReportPreview::addToHeaderData(const QString &strLeft, const QString &strRi
 
 void ReportPreview::initInputs()
 {
-  switch (m_report.reportType().underlying())
+  switch (m_report.reportType())
   {
   case ReportType::ParticipantDistance:
   {
@@ -1282,7 +1282,7 @@ void EventTypeModel::initModel()
 QColor EventTypeModel::eventColor(ReportManagement::EventType eventTypeId) const
 {
   DEBUG_LOG(m_logger) << "eventColor for event type " << eventTypeId;
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return QColor(Qt::red);
   case ReportManagement::EventType::VitalityChanged:     return QColor(Qt::green);
@@ -1302,7 +1302,7 @@ QColor EventTypeModel::eventColor(ReportManagement::EventType eventTypeId) const
 
 KDChart::MarkerAttributes::MarkerStyle EventTypeModel::eventMarker(ReportManagement::EventType eventTypeId) const
 {
-  switch (eventTypeId.underlying())
+  switch (eventTypeId)
   {
   case ReportManagement::EventType::VBGChanged:          return KDChart::MarkerAttributes::MarkerSquare;
   case ReportManagement::EventType::VitalityChanged:     return KDChart::MarkerAttributes::MarkerDiamond;

qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.h

@@ -10,6 +10,7 @@
 #include <ReportManagement/rep_ftc.h>
 
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <AreaEffectSimulation/aes_dtc.h>