Session 026: Lts/Services Qt5:: to Qt6:: migration

- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt

@@ -20,75 +20,41 @@ SET(SRCS_common
   logger.h
 )
 
-IF(BUILD_RTI)
-  # Generate pdm_enums.idl / pdm.idl
-  CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
+# Generate pdm_enums.idl / pdm.idl
+CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
 
-  # Generate pdm_db.h
-  CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
-  # Generate pdm_db_impl.cpp/.h,
-  CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
+# Generate pdm_db.h
+CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
+# Generate pdm_db_impl.cpp/.h,
+CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
 
-  # Generate *.cpp/*.hpp from idl
-  RTIDDSGEN(SRCS_common pdm_enums.idl)
-  RTIDDSGEN(SRCS_common pdm.idl)
+# Generate *.cpp/*.hpp from idl
+RTIDDSGEN(SRCS_common pdm_enums.idl)
+RTIDDSGEN(SRCS_common pdm.idl)
 
-  # Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
-  CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
-  # generate pdm_[d|f]tc.h
-  CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
-ELSE()
-  # Stub files for BUILD_RTI=OFF - NO code generation
-  LIST(APPEND SRCS_common
-    stubs/pdm_enums_stub.hpp
-    stubs/pdm_stub.hpp
-    stubs/pdm_db_stub.hpp
-  )
-ENDIF()
+# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
+CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
+# generate pdm_[d|f]tc.h
+CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
-# Create target only if component flags allow
-NGL_ADD_LIBRARY2(AAR SV WS HLA svcPdmCommon SHARED  ${SRCS_common})
-
-# Generate export header ALWAYS (needed even if target not built)
-IF(NOT TARGET svcPdmCommon)
-  # Create a dummy static library just for export header generation
-  ADD_LIBRARY(svcPdmCommon STATIC ${SRCS_common})
-ENDIF()
-
-# Generate export header BEFORE setting include directories
-GENERATE_EXPORT_HEADER(svcPdmCommon EXPORT_FILE_NAME "svcpdmcommon_export.h")
-
-# Include directories for svcPdmCommon (must include build dir for export header)
-IF(TARGET svcPdmCommon)
-  TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
-    PUBLIC
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ${CMAKE_CURRENT_BINARY_DIR}
-      ${CMAKE_SOURCE_DIR}/include/ProjectDataManagement
-      ${CMAKE_CURRENT_SOURCE_DIR}/../
-      ${CMAKE_CURRENT_BINARY_DIR}/../
-      ${CMAKE_CURRENT_SOURCE_DIR}/stubs
-      ${CMAKE_CURRENT_BINARY_DIR}/stubs
-  )
-ENDIF()
-NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
+NGL_ADD_LIBRARY(AAR SV WS HLA svcPdmCommon SHARED  ${SRCS_common})
+NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
   PUBLIC
-    Qt6::Core
-    NGLLogger
-    LtsUtilsCore
-    ngldb
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
   PRIVATE
     RTI::nddscpp2
   PUBLIC
+    Qt6::Core
     ddscore
+    NGLLogger
+    LtsUtilsCore
+    ngldb
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcPdmCommon)
 
-IF(BUILD_RTI)
 #
 # --- Library svcPdmClient --------------------------------------------------------------------------------
 #
@@ -100,7 +66,7 @@ SET(SRCS_client
 # generate pdm_ftc_impl.[cpp|h]
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
 
-NGL_ADD_LIBRARY2(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
+NGL_ADD_LIBRARY(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmClient
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -126,7 +92,7 @@ SET(SRCS_server
 # generate pdm_[d|f]ts.h, pdm_[d|f]ts_impl.[cpp|h]
 CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
 
-NGL_ADD_LIBRARY2(WS AAR SV svcPdmServer SHARED ${SRCS_server})
+NGL_ADD_LIBRARY(WS AAR SV svcPdmServer SHARED ${SRCS_server})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmServer
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -198,5 +164,3 @@ NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
 # Uncomment if necessary
 #ADD_SUBDIRECTORY(UnitTests)
 ADD_SUBDIRECTORY(ModuleTests)
-
-ENDIF(BUILD_RTI)

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp

@@ -10,18 +10,20 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QtCore/QTimer>
+#include <QTimer>
 
 #include <ProjectDataManagement/pdm_dtc.h>
 
 //---------------------------------------------------------------------------------
 namespace ProjectDataManagement
 {
-PdmTests::PdmTests(QObject *parent) : QObject(parent)
+PdmTests::PdmTests(QObject *parent)
+  : QObject(parent)
   , m_id(0)
   , m_testId(0)
-  , m_bTestsSuccessful(true),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_bTestsSuccessful(true)
+  , m_logger(getLogger("Test"))
+{
  qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.h

@@ -11,17 +11,12 @@
 #pragma once
 
 #include <ProjectDataManagement/pdm_dtc.h>
-// pdm_ftc.h - external dependency, removed for build
+#include <ProjectDataManagement/pdm_ftc.h>
 #include <ProjectDataManagement/logger.h>
 #include <DDS/DDSConnector/dds_connector.h>
 
 namespace ProjectDataManagement
 {
-namespace Interface {
-namespace Ftc {
-}
-}
-
 class PdmTests : public QObject
 {
   Q_OBJECT

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp

@@ -17,6 +17,7 @@ ChargeTypeRename::ChargeTypeRename(const std::shared_ptr<DdsHandler> &dds, const
   , Interface::Fts::UpdateChargeTypeRequestHandler(dds->fts())
   , m_dds(dds)
   , m_db(db)
+  , m_logger(getLogger("ChargeTypeRename"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <ProjectDataManagement/pdm_fts.h>
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "logger.h"
 
@@ -29,8 +29,6 @@ public:
   ~ChargeTypeRename() = default;
 
 private:
-
-NGL::INGLLogger &m_logger;
   void onUpdateChargeNamesRequest(const rti::core::SampleIdentity &cookie,
                                   const UpdateChargeNamesRequest &request) override;
 //  void onSuppressVisibilityRequest(const rti::core::SampleIdentity &cookie,
@@ -40,5 +38,6 @@ NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<DdsHandler> m_dds;
   std::shared_ptr<DatabaseInterface> m_db;
+  NGL::INGLLogger &m_logger;
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp

@@ -15,6 +15,7 @@ namespace ProjectDataManagement
 
 DdsHandler::DdsHandler(int domainId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
+  , m_logger(getLogger("DdsHandler"))
 {
   DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h

@@ -37,12 +37,13 @@ public:
   std::shared_ptr<DDSConnector::DdsConnector>            dds() const { return m_ddsConnector; }
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>            m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>                       m_pacemaker;
   std::shared_ptr<Core::TopicLockMaster>                 m_topicLockMaster;
   std::shared_ptr<ProjectDataManagement::Interface::Dts> m_ddsDts;
   std::shared_ptr<ProjectDataManagement::Interface::Fts> m_ddsFts;
+
+  NGL::INGLLogger          &m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/logger.h

@@ -9,14 +9,13 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include <QtCore/QString>
-#include "svcpdmcommon_export.h"
+#include "pdm_export.h"
 
 namespace ProjectDataManagement
 {
 using LOGGER_T = NGL::INGLLogger &;
 
-SVCPDMCOMMON_EXPORT LOGGER_T getLogger(const char *name);
+PDM_COMMON_EXPORT LOGGER_T getLogger(const char *name);
 inline LOGGER_T getLogger(const QString &loggerName)
 {
   return getLogger(loggerName.toUtf8().constData());

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp

@@ -7,7 +7,7 @@
 
 #include "main_handler.h"
 #include "settings.h"
-#include <QtCore/QSettings>
+#include <QSettings>
 
 #include "convert_db_to_dds.h"
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.h

@@ -32,10 +32,11 @@ public:
   std::shared_ptr<DatabaseInterface> db() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>  m_ddsHandler;
   std::shared_ptr<DbHandler>   m_dbHandler;
   std::shared_ptr<Translation> m_translation;
   std::shared_ptr<ChargeTypeRename> m_chargeTypeRename;
+  NGL::INGLLogger             &m_logger;
+
 };
 } // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp

@@ -8,15 +8,14 @@
  */
 
 #include "pdm_dtc_impl_custom.h"
-#include <utility>
 #include "NGLLogger/INGLLogger.h"
 #include "pdm_translation.h"
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QSet>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QSet>
+#include <QVariant>
+#include <QVector>
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>
 #include <ProjectDataManagement/pdm_translation.h>
@@ -1160,7 +1159,7 @@ QStringList DtcImplCustom::chargeNames(std::vector<int> &chargeIds)
     QStringList sl;
     auto uleisClassOffsets = it.value();
     sl.reserve(uleisClassOffsets.size());
-    for (UleisClassOffset o : std::as_const(uleisClassOffsets))
+    for (UleisClassOffset o : qAsConst(uleisClassOffsets))
       sl << offsetName(o);
 
     if (sl.size() == 6)
@@ -1616,7 +1615,7 @@ ProjectDataManagement::BuildingChargeEffect DtcImplCustom::getBuildingChargeEffe
     waitForHistoricalDataBuildingChargeEffect(2000);
   }
 
-  for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : std::as_const(m_buildingChargeEffectCont))
+  for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : qAsConst(m_buildingChargeEffectCont))
   {
     if (bcEffect.chargeTypeId() == chargeTypeId)
     {
@@ -1676,7 +1675,7 @@ QString DtcImplCustom::adlerLoadTypeName(int loadTypeId)
 
 QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
 {
-  for (const ProjectDataManagement::TargetType &targetTyp : std::as_const(m_targetTypeCont))
+  for (const ProjectDataManagement::TargetType &targetTyp : qAsConst(m_targetTypeCont))
   {
     const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetTyp.properties().c_str(),
                                                                             targetTyp.properties().size())).object();
@@ -1688,7 +1687,7 @@ QString DtcImplCustom::adlerTargetTypeName(int targetTypeId)
 
 QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId)
 {
-  for (const ProjectDataManagement::TargetSubType &targetSubTyp : std::as_const(m_targetSubTypeCont))
+  for (const ProjectDataManagement::TargetSubType &targetSubTyp : qAsConst(m_targetSubTypeCont))
   {
     const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetSubTyp.properties().c_str(),
                                                                             targetSubTyp.properties().size())).object();

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h

@@ -8,9 +8,9 @@
  */
 #pragma once
 
-#include <QtCore/QHash>
-#include <QtCore/QJsonObject>
-#include <QtCore/QVector>
+#include <QHash>
+#include <QJsonObject>
+#include <QVector>
 #include <ProjectDataManagement/pdm_dtc_impl.h>
 
 //-------------------------------------------------------------------------------------------------------------

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp

@@ -9,64 +9,61 @@
 
 #include "pdm_to_string.h"
 #include "pdm_translation.h"
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 namespace ProjectDataManagement
 {
-
-// Forward declaration for helper function
-static QString toString(VulnerabilityState vs);
-
 //
 // VulnerabilityState + VulnerabilityClass
 //
 static QString toStringBuilding(VulnerabilityState vs)
 {
-  switch (static_cast<int>(vs))
+  switch (vs.underlying())
   {
 #ifdef ETS_MODE
-  case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
+  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding");
 #else
-  case 1: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
+  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding");
 #endif
   default: break;
   }
-  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
+  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
 }
 
 static QString toStringVehicle(VulnerabilityState vs)
 {
-  switch (static_cast<int>(vs))
+  switch (vs.underlying())
   {
 #ifdef ETS_MODE
-  case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
-  case 2: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
-  case 4: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
-  case 5: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  case 2: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
-  case 4: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
-  case 5: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
-  case 6: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
-  case 7: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
-  case 8: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
-  case 9: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
-  case 1:
-  case 0:
-  case 10:
-  case 11:
-  case 12:
-  case 13:
-  case 14:
-  case 15:
-  case 16:
-  case 17:
+  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CombatReady:
+  case VulnerabilityState_def::NoChange:
+  case VulnerabilityState_def::TemporarySeverance:
+  case VulnerabilityState_def::NearMiss:
+  case VulnerabilityState_def::HitWithNoEffect:
+  case VulnerabilityState_def::VulnerabilityBitsChanged:
+  case VulnerabilityState_def::NContamination:
+  case VulnerabilityState_def::BContamination:
+  case VulnerabilityState_def::CContamination:
+  case VulnerabilityState_def::NotReady:  // Internal
+  case VulnerabilityState_def::Reserved:  // Internal
     break;  // use common translation from toString()
 #endif
   }
@@ -76,70 +73,60 @@ static QString toStringVehicle(VulnerabilityState vs)
 
 static QString toStringSoldier(VulnerabilityState vs)
 {
-  switch (static_cast<int>(vs))
+  switch (vs.underlying())
   {
 #ifdef ETS_MODE
-  case 1: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
-  case 2: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
-  case 4: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
-  case 5: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle");
   default:
     break;
 #else
-  case 2: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
-  case 4: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
-  case 5: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
-  case 7: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
-  case 8: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
-  case 1:
-  case 10:
-  case 11:
-  case 12:
-  case 13:
-  case 14:
-  case 15:
-  case 16:
-  case 6:
-  case 0:
-  case 17:
+  case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier");
+  case VulnerabilityState_def::CombatReady:
+  case VulnerabilityState_def::TemporarySeverance:
+  case VulnerabilityState_def::NearMiss:
+  case VulnerabilityState_def::HitWithNoEffect:
+  case VulnerabilityState_def::VulnerabilityBitsChanged:
+  case VulnerabilityState_def::NContamination:
+  case VulnerabilityState_def::BContamination:
+  case VulnerabilityState_def::CContamination:
+  case VulnerabilityState_def::NoChange:
     break;  // use common translation from toString()
   // those should not happen ...
+  case VulnerabilityState_def::MobilityKill:
+  case VulnerabilityState_def::VisibleMobilityKill:
+  case VulnerabilityState_def::NotReady:  // Internal
+  case VulnerabilityState_def::Reserved:  // Internal
+    break;
 #endif
   }
   return toString(vs);
 }
 
-QString toString(VulnerabilityState vs)
-{
-  switch (static_cast<int>(vs))
-  {
-  case 0: return QCoreApplication::translate("ProjectDataManagement", "Unknown", "VulnerabilityState");
-  case 1: return QCoreApplication::translate("ProjectDataManagement", "Normal", "VulnerabilityState");
-  case 2: return QCoreApplication::translate("ProjectDataManagement", "Warning", "VulnerabilityState");
-  case 3: return QCoreApplication::translate("ProjectDataManagement", "Critical", "VulnerabilityState");
-  default: break;
-  }
-  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
-}
-
 QString toString(VulnerabilityState vs, VulnerabilityClass vc)
 {
-  switch (static_cast<int>(vc))
+  switch (vc.underlying())
   {
-  case 0: // Unknown
-  case 1: // WtdDamages
-  case 2: // WtdInjuries
+  case VulnerabilityClass_def::Unknown:
+  case VulnerabilityClass_def::WtdDamages:
+  case VulnerabilityClass_def::WtdInjuries:
     return toString(vs);
-  case 3: // BuildingDamages
+  case VulnerabilityClass_def::BuildingDamages:
     return toStringBuilding(vs);
-  case 4: // VehicleDamages
+  case VulnerabilityClass_def::VehicleDamages:
     return toStringVehicle(vs);
-  case 5: // SoldierInjuries
+  case VulnerabilityClass_def::SoldierInjuries:
     return toStringSoldier(vs);
   }
-  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast<int>(vs));
+  return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying());
 }
 
 } // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h

@@ -6,9 +6,8 @@
 * $Author$
 */
 
-#include <ProjectDataManagement/pdm_types.h>
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 namespace ProjectDataManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QtCore/QString>
+#include <QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp

@@ -1,10 +1,9 @@
 #include "static_pvsan_import.h"
-#include <utility>
 
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QDir>
-#include <QtCore/QSet>
+#include <QFile>
+#include <QTextStream>
+#include <QDir>
+#include <QSet>
 #include <ngltools/ngltools_filesystem.h>
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
@@ -294,7 +293,7 @@ bool PvSanImport::addProcedures(const QVector<QString> &procedures)
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : std::as_const(translations))
+  for (const auto &tr : qAsConst(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -419,7 +418,7 @@ bool PvSanImport::addMaterial(const QVector<QString> &material)
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : std::as_const(translations))
+  for (const auto &tr : qAsConst(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -482,7 +481,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   QVector<Database::PdmTranslation> translations;
   m_db->select(translations);
   QSet<quint64> idsToRemove;
-  for (const auto &tr : std::as_const(translations))
+  for (const auto &tr : qAsConst(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -496,7 +495,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryKind injuryKindDb;
-  for (const QString &kd : std::as_const(kind))
+  for (const QString &kd : qAsConst(kind))
  {
     QStringList kde = kd.split(QStringLiteral(";"));
     if (kde.size() < 3 )
@@ -527,7 +526,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   myContext = QStringLiteral("SanitationInjuryPlace1");
   m_db->truncatePdmSanitationInjuryPlace1();
   idsToRemove.clear();
-  for (const auto &tr : std::as_const(translations))
+  for (const auto &tr : qAsConst(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -541,7 +540,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryPlace1 placeDb;
-  for (const QString &place : std::as_const(place1))
+  for (const QString &place : qAsConst(place1))
  {
     QStringList pl = place.split(QStringLiteral(";"));
     if (pl.size() < 3 )
@@ -573,7 +572,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   myContext = QStringLiteral("SanitationInjuryPlace2");
   m_db->truncatePdmSanitationInjuryPlace2();
   idsToRemove.clear();
-  for (const auto &tr : std::as_const(translations))
+  for (const auto &tr : qAsConst(translations))
   {
     if (tr.context == myContext)
       idsToRemove.insert(tr.id);
@@ -587,7 +586,7 @@ bool PvSanImport::addInjuryPlaces(const QVector<QString> &kind, const QVector<QS
   //insert into db
   trans.context = myContext;
   Database::PdmSanitationInjuryPlace2 place2Db;
-  for (const QString &place : std::as_const(place2))
+  for (const QString &place : qAsConst(place2))
  {
     QStringList pl = place.split(QStringLiteral(";"));
     if (pl.size() < 3 )
@@ -634,7 +633,7 @@ bool PvSanImport::addInjuries(const QVector<QString> &injuries)
   trans.context = myContext;
   Database::PdmSanitationInjury injuryDb;
   int id = 1;
-  for (const QString &injury : std::as_const(injuries))
+  for (const QString &injury : qAsConst(injuries))
  {
     QStringList kde = injury.split(QStringLiteral(";"));
     if (kde.size() <  29 )

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h

@@ -12,7 +12,7 @@
 
 #include "logger.h"
 #include <string>
-#include <QtCore/QString>
+#include <QString>
 
 namespace ProjectDataManagement
 {
@@ -22,7 +22,6 @@ public:
  PvSanImport(const std::shared_ptr<DatabaseInterface> &db,
             NGL::INGLLogger &logger);
 private:
-NGL::INGLLogger &m_logger;
 qint64 getCode(const QString &type, int typeId);
 
 bool publishDataPvSan();
@@ -39,5 +38,6 @@ bool addInjuries(const QVector<QString> &injuries);
 
 QString m_version;
 const std::shared_ptr<DatabaseInterface> &m_db;
+NGL::INGLLogger &m_logger;
 };
 } // namespace ProjectDataManagement

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp

@@ -6,14 +6,13 @@
   */
 
 #include "translation.h"
-#include <utility>
 #include "dds_handler.h"
-#include <QtCore/QTimer>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QCryptographicHash>
-#include <LtsUtils/LtsUtilsCore/dds_vector.h>
+#include <QTimer>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QCryptographicHash>
+#include <LtsUtilsCore/dds_vector.h>
 
 namespace ProjectDataManagement
 {
@@ -23,6 +22,7 @@ Translation::Translation(const std::shared_ptr<DdsHandler> &dds, const std::shar
   : Interface::Fts::InsertUpdateTranslationRequestHandler(dds->fts())
   , m_dds(dds)
   , m_db(db)
+  , m_logger(getLogger("Translation"))
 {
   DEBUG_LOG(m_logger) << "Translation ctor";
   m_publishTimer.setInterval(1000);
@@ -61,7 +61,7 @@ void Translation::collectAndPublishData()
 void Translation::publishData()
 {
   QJsonArray arr;
-  for (const QJsonObject &obj : std::as_const(m_jsonData))
+  for (const QJsonObject &obj : qAsConst(m_jsonData))
     arr += obj;
 
   const QJsonObject jObj{ {QStringLiteral("translations"), arr} };

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h

@@ -10,9 +10,9 @@
 #include <ProjectDataManagement/pdm_dts.h>
 #include <ProjectDataManagement/pdm_fts.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QJsonObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QJsonObject>
+#include <QTimer>
 #include "logger.h"
 
 namespace ProjectDataManagement
@@ -30,15 +30,14 @@ protected Q_SLOTS:
   void collectAndPublishData();
   void publishData();
 private:
-  NGL::INGLLogger &m_logger;
   void addToJson(const Database::PdmTranslation &data);
   void onInsertUpdateTranslationRequest(const rti::core::SampleIdentity &cookie,
                                         const InsertUpdateTranslationRequest &request) override;
 private:
-  NGL::INGLLogger &m_logger;
   QHash<int, QJsonObject> m_jsonData;
   std::shared_ptr<DdsHandler> m_dds;
   std::shared_ptr<ProjectDataManagement::DatabaseInterface> m_db;
   QTimer m_publishTimer;
+  NGL::INGLLogger &m_logger;
 };
 }