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

@@ -12,12 +12,6 @@ SET(UnitTestSources
 
 NGL_ADD_EXECUTABLE(SV aesModuleTestLimits  ${LinkedSources} ${UnitTestSources} )
 
-NGL_TARGET_INCLUDE_DIRECTORIES(aesModuleTestLimits
-     PUBLIC
-       ${CMAKE_SOURCE_DIR}/Lts/
-       ${CMAKE_SOURCE_DIR}/Lts/Services/
-)
-
 NGL_TARGET_LINK_LIBRARIES(aesModuleTestLimits
      NGLLogger
      nglcoreapplication

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp

@@ -7,19 +7,18 @@
   */
 
 #include "limits_module_test.h"
-#include <utility>
 #include "qtestcase.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 // AES
 #include <AreaEffectSimulation/Utils/polygons.h>
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 #include <Core/core.hpp>
 
 
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
+#include <QTimer>
+#include <QDebug>
 
 #include <iostream>
 
@@ -39,6 +38,7 @@ static const int s_pauseTimeInSec = 5;
 ModuleTestLimits::ModuleTestLimits(int domainId, int exerciseId)
   : m_domainId(domainId)
   , m_exerciseId(exerciseId)
+  , m_logger(getLogger("ModuleTestLimits"))
 {
 }
 
@@ -71,7 +71,7 @@ void ModuleTestLimits::testExplosionClusterCentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->explosionClusters();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -104,7 +104,7 @@ void ModuleTestLimits::testExplosionClusterDecentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->explosionClusters();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if ((item.effectStateId() == AesEffectState::EsPrepared) && (item.isCentral() == false))
       ++counter;
@@ -140,7 +140,7 @@ void ModuleTestLimits::testAirSupports()
 
   int counter = 0;
   const auto &items = m_aesDtc->explosionClusters();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() && m_pdmDtc->gearClassFromChargeTypeId(item.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport)
       ++counter;
@@ -173,7 +173,7 @@ void ModuleTestLimits::testMineAreaCentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->mineAreas();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if ((item.effectStateId() == AesEffectState::EsPrepared) && (item.isCentral() == true))
       ++counter;
@@ -207,7 +207,7 @@ void ModuleTestLimits::testMineAreaDecentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->mineAreas();
-  for (const auto &curMineArea : std::as_const(items))
+  for (const auto &curMineArea : qAsConst(items))
   {
     if ((curMineArea.effectStateId() == AesEffectState::EsPrepared) && (curMineArea.isCentral() == false))
       ++counter;
@@ -234,7 +234,7 @@ void ModuleTestLimits::testMineAreaDecentral()
   int counter2 = 0;
 
   const auto &mineAreas = m_aesDtc->mineAreas();
-  for (const auto &item : std::as_const(mineAreas))
+  for (const auto &item : qAsConst(mineAreas))
   {
     if ((item.effectStateId() == AesEffectState::EsPrepared) &&
         !item.isCentral() &&
@@ -270,7 +270,7 @@ void ModuleTestLimits::testNBCCentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->nContaminations();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -305,7 +305,7 @@ void ModuleTestLimits::testNBCDecentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->nContaminations();
-  for (const auto &item :  std::as_const(items))
+  for (const auto &item :  qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
       ++counter;
@@ -337,7 +337,7 @@ void ModuleTestLimits::testOffRouteMines()
 
   int counter = 0;
   const auto &items = m_aesDtc->offRouteMines();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -369,7 +369,7 @@ void ModuleTestLimits::testBoobyTraps()
 
   int counter = 0;
   const auto &items = m_aesDtc->boobyTraps();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -404,7 +404,7 @@ void ModuleTestLimits::testBCCCentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->bCContaminations();
-  for (const auto &item :  std::as_const(items))
+  for (const auto &item :  qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -439,7 +439,7 @@ void ModuleTestLimits::testBCCDecentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->bCContaminations();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
       ++counter;
@@ -474,7 +474,7 @@ void ModuleTestLimits::testFADecentral()
 
   int counter = 0;
   const auto &items = m_aesDtc->functionalAreas();
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == false)
       ++counter;
@@ -511,7 +511,7 @@ void ModuleTestLimits::testFACentral()
   int counter = 0;
   const auto &items = m_aesDtc->functionalAreas();
 
-  for (const auto &item : std::as_const(items))
+  for (const auto &item : qAsConst(items))
   {
     if (item.effectStateId() == AesEffectState::EsPrepared && item.isCentral() == true)
       ++counter;
@@ -1192,7 +1192,7 @@ void ModuleTestLimits::deleteAesAreas()
   const QVector<AesEffectState::type> sts = {AesEffectState::EsExpired, AesEffectState::EsRemoved, AesEffectState::EsActivated};
 
   auto clusters = m_aesDtc->explosionClusters();
-  for (auto cluster : std::as_const(clusters))
+  for (auto cluster : qAsConst(clusters))
   {
     if (!sts.contains(cluster.effectStateId().underlying()))
     {
@@ -1202,7 +1202,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto nbcs = m_aesDtc->nContaminations();
-  for (auto nbc : std::as_const(nbcs))
+  for (auto nbc : qAsConst(nbcs))
   {
     if (!sts.contains(nbc.effectStateId().underlying()))
     {
@@ -1212,7 +1212,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto orms = m_aesDtc->offRouteMines();
-  for (auto orm : std::as_const(orms))
+  for (auto orm : qAsConst(orms))
   {
     if (!sts.contains(orm.effectStateId().underlying()))
     {
@@ -1222,7 +1222,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto bts = m_aesDtc->boobyTraps();
-  for (auto bt : std::as_const(bts))
+  for (auto bt : qAsConst(bts))
   {
     if (!sts.contains(bt.effectStateId().underlying()))
     {
@@ -1232,7 +1232,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto mas = m_aesDtc->mineAreas();
-  for (auto ma : std::as_const(mas))
+  for (auto ma : qAsConst(mas))
   {
     if (!sts.contains(ma.effectStateId().underlying()))
     {
@@ -1242,7 +1242,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto bccs = m_aesDtc->bCContaminations();
-  for (auto bcc : std::as_const(bccs))
+  for (auto bcc : qAsConst(bccs))
   {
     if (!sts.contains(bcc.effectStateId().underlying()))
     {
@@ -1252,7 +1252,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto fas = m_aesDtc->functionalAreas();
-  for (auto fa : std::as_const(fas))
+  for (auto fa : qAsConst(fas))
   {
     if (!sts.contains(fa.effectStateId().underlying()))
     {
@@ -1262,7 +1262,7 @@ void ModuleTestLimits::deleteAesAreas()
     }
   }
   auto tas = m_aesDtc->technicalAreas();
-  for (auto ta : std::as_const(tas))
+  for (auto ta : qAsConst(tas))
   {
     if (!sts.contains(ta.effectStateId().underlying()))
     {
@@ -1273,7 +1273,7 @@ void ModuleTestLimits::deleteAesAreas()
   }
 
   auto eas = m_aesDtc->explosionAreas();
-  for (auto ea : std::as_const(eas))
+  for (auto ea : qAsConst(eas))
   {
     if (!sts.contains(ea.effectStateId().underlying()))
     {
@@ -1284,7 +1284,7 @@ void ModuleTestLimits::deleteAesAreas()
   }
 
   auto ess = m_aesDtc->explosionSingles();
-  for (auto es : std::as_const(ess))
+  for (auto es : qAsConst(ess))
   {
     if (!sts.contains(es.effectStateId().underlying()))
     {
@@ -1360,7 +1360,7 @@ int main(int argc, char *argv[])
 
 
   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;
 
   // enable_create_bulk only if it´s explicitly called by user:

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.h

@@ -19,12 +19,12 @@
 
 #include <ExerciseManagement/exm_dtc.h>
 #include <InfrastructureManagement/ism_dtc.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <ParticipantManagement/ppm_ftc.h>
 
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QtTest/QTest>
 
 #include <memory>
@@ -224,6 +224,9 @@ private:
     }
   }
   m_counterDds;
+
+  LOGGER_T m_logger;
+
 public:
   void onMineAreaModifyReply(const Core::FunctionReplyObject &reply) override            {  Q_UNUSED(reply);}
   void onExplosionAreaModifyReply(const Core::FunctionReplyObject &reply) override       {  Q_UNUSED(reply);}