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/ExerciseManagement/UnitTests/data_topic_tests.cpp

@@ -12,17 +12,18 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <DDS/QosProfile/DDS_DefaultQos.h>
-#include <Lts/Common/ProjectConfig/project_defines.h>
+#include <Common/ProjectConfig/project_defines.h>
 #include <DDS/DTS/generic_dts_impl.h>
 #include <DDS/DTC/generic_dtc_impl.h>
 
 #include <QtTest/QTest>
-#include <QtCore/QVariant>
-#include <QtCore/QThread>
+#include <QVariant>
+#include <QThread>
 
 
 
-DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
+DataTopicTests::DataTopicTests()
+  : m_domainParticipantPub(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_ddsPublisher(nullptr)
@@ -32,8 +33,8 @@ DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
   , m_subscriberListenerBinder(nullptr)
   , m_dtcExercise(nullptr)
   , m_mainThreadId(QThread::currentThreadId())
-  .getNGLLogger("UnitTests.DataTopicTests")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {  
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.DataTopicTests"))
+{  
   if (!DDS::QosProfile::setDefault())
     ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
 

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h

@@ -8,13 +8,13 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <DDS/Generic/subscriber_listener.h>
 
 // For Topic Exercise
 #include <ExerciseManagement/exm_dtc_types.h>
 #include <ExerciseManagement/exm_dts_types.h>
-#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
+#include <LtsUtilsCore/data_modification_enum.h>
 
 #include <ExerciseManagement/exm.hpp>
 #include <rti/core/ListenerBinder.hpp>
@@ -42,7 +42,6 @@ public:
   ExerciseManagement::Exercise getReceivedExerciseData() const { return m_receivedExerciseData; }
 
 protected:
-  NGL::INGLLogger &m_logger;
   // Subscriber Methods
   void processData(const ExerciseManagement::Exercise& instance, DataModification modType);
 
@@ -68,6 +67,8 @@ private:
   Qt::HANDLE                      m_mainThreadId;
   // For returning TestData
   ExerciseManagement::Exercise    m_receivedExerciseData;
+
+  NGL::INGLLogger&                m_logger;
 };
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.cpp

@@ -12,7 +12,7 @@
 
 #include <QtTest/QTest>
 
-#include <Lts/Common/ProjectConfig/project_defines.h>
+#include <Common/ProjectConfig/project_defines.h>
 #include <nglapplication/nglcoreapplication.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests_main.h

@@ -8,7 +8,7 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QSignalSpy>
 #include <ExerciseManagement/exm_dts_types.h>
 
@@ -35,11 +35,12 @@ private Q_SLOTS:
 
 protected:
 
-  NGL::INGLLogger &m_logger;
 private:
   ExerciseManagement::Exercise m_sentExerciseData;
   QSignalSpy       *m_exerciseDataArrivedSpy = nullptr;
   DataTopicTests   *m_dtTest = nullptr;
+  NGL::INGLLogger  &m_logger;
+
 };
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.cpp

@@ -11,18 +11,20 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <DDS/QosProfile/DDS_DefaultQos.h>
-#include <Lts/Common/ProjectConfig/project_defines.h>
+#include <Common/ProjectConfig/project_defines.h>
 
 
-Initialisation::Initialisation() : m_domainParticipant(nullptr)
+Initialisation::Initialisation()
+  : m_domainParticipant(nullptr)
   , m_domainParticipantSub(nullptr)
   , m_domainId(0)
   , m_partitionId(-1)
   , m_ddsPublisher(nullptr)
   , m_ddsSubscriber(nullptr)
   , m_subListener(new DTC::SubscriberListener)
-  .getNGLLogger("UnitTests.Initialisation")),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {  
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.Initialisation"))
+
+{  
   DDS::DefaultQos defaultQos;
 
   //if (!defaultQos.setDefaultQos(QStringList("/shd/CTC/SV/.default_dds_profile.xml")))

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/initialisation.h

@@ -38,7 +38,6 @@ public:
   DTC::SubscriberListener       *getSubscriberListener()   { return m_subListener; }
 
 private:
-  NGL::INGLLogger &m_logger;
   dds::domain::DomainParticipant m_domainParticipant;
   dds::domain::DomainParticipant m_domainParticipantSub;
   int                            m_domainId;
@@ -47,6 +46,8 @@ private:
   dds::sub::Subscriber           m_ddsSubscriber;
 
   DTC::SubscriberListener       *m_subListener;
+
+  NGL::INGLLogger               &m_logger;
 };