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/AreaEffectSimulation/ModuleTest_EffectCluster/CMakeLists.txt

@@ -13,12 +13,6 @@ SET(UnitTestSources
 IF(BUILD_TESTING)
 	ADD_EXECUTABLE(aesModuleTestEffectCluster ${LinkedSources} ${UnitTestSources} )
 
-	NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestEffectCluster
-     PUBLIC
-       ${CMAKE_SOURCE_DIR}/Lts/
-       ${CMAKE_SOURCE_DIR}/Lts/Services/
-   )
-
 	TARGET_LINK_LIBRARIES(aesModuleTestEffectCluster
      NGLLogger
      nglcoreapplication

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "effect_cluster_module_test.h"
-#include <utility>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <nglapplication/nglcoreapplication.h>
 
@@ -18,14 +17,14 @@
 // PPM
 #include "ParticipantManagement/ppm_ftc_types.h"
 #include "TrainingAreaBase/tab.hpp"
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QTimer>
-#include <QtCore/QVector>
-#include <QtCore/QXmlStreamReader>
+#include <QDateTime>
+#include <QDebug>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QTimer>
+#include <QVector>
+#include <QXmlStreamReader>
 
 #include <iostream>
 
@@ -75,6 +74,7 @@ double distanceMeter(const Core::GeoPosition2D &geoPos2D, const LtsCoordTrans::U
 ModuleTestEffectCluster::ModuleTestEffectCluster(int domainId, int exerciseId)
     : m_domainId(domainId)
     , m_exerciseId(exerciseId)
+    , m_logger(getLogger("ModuleTestEffectCluster"))
 {
   m_timer = new QTimer(this);
   m_timer->setSingleShot(true);
@@ -241,7 +241,7 @@ void ModuleTestEffectCluster::onTrajectoryTimeAwareChanged(const TrajectoryTimeA
 
 void ModuleTestEffectCluster::dumpCnt()
 {
-  DEBUG_LOG(m_logger) << Q_FUNC_INFO << " Counter: "
+  DEBUG_LOG(m_logger) << LOGFUNCTION << " Counter: "
                       << " cntEffectCluster = " << m_counterDds.cntEffectCluster << ",  cntAtEffectCluster = " << m_counterDds.cntAtEffectCluster
                       << ",  cntGunToTargetLine = " << m_counterDds.cntAtEffectClusterGunToTargetLine << ",  cntClusterEffects = " << m_counterDds.cntEffectClusterEffects
                       << ",  cntTrajectory = " << m_counterDds.cntTrajectory;
@@ -507,7 +507,7 @@ void ModuleTestEffectCluster::waitForEffectStates(int lineNumber, int durPrep, i
     return;
   }
 
-  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsPrepared...";
+  INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsPrepared...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared; }, durPrep))
   {
     ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
@@ -515,7 +515,7 @@ void ModuleTestEffectCluster::waitForEffectStates(int lineNumber, int durPrep, i
     return;
   }
 
-  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsActivated...";
+  INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsActivated...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated; }, durAct))
   {
     ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
@@ -523,7 +523,7 @@ void ModuleTestEffectCluster::waitForEffectStates(int lineNumber, int durPrep, i
     return;
   }
 
-  INFO_LOG(m_logger) << Q_FUNC_INFO << "  waiting for EsExpired...";
+  INFO_LOG(m_logger) << LOGFUNCTION << "  waiting for EsExpired...";
   if (!waitForData([this]() { return m_data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired; }, durExp))
   {
     ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of explosion cluster with id " << m_data.id() << ", lineNumber = " << lineNumber;
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
     --argc;
 
   const QStringList &slPositionalArgs = options.positionalArguments();
-  for (const QString &item : std::as_const(slPositionalArgs))
+  for (const QString &item : qAsConst(slPositionalArgs))
     std::cout << " item = " << item << std::endl;
 
   ModuleTestEffectCluster tc(options.domainId(), options.exerciseId());

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.h

@@ -25,12 +25,12 @@
 
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ExerciseManagement/exm_dtc.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 #include <TrainingAreaBase/tab_dts.h>
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 #include <QtTest/QTest>
 
@@ -61,8 +61,6 @@ public:
   ModuleTestEffectCluster(int domainId, int exerciseId);
 
 protected:
-
-NGL::INGLLogger &m_logger;
   void onEffectClusterModifyReply(const Core::FunctionReplyObject &replyObject) override;
   void onAcknowledgeExternalAesItemReply(const Core::FunctionReplyObject &replyObject) override;
   void onModifyPartyDataReply(const Core::FunctionReplyObject &replyObject) override;
@@ -187,6 +185,8 @@ private:
     }
   }
   m_counterDds;
+
+  LOGGER_T m_logger;
 };