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

@@ -30,13 +30,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 # Generate xxx_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcXxxCommon SHARED  ${SRCS_common})
+NGL_ADD_LIBRARY(AAR SV WS svcXxxCommon SHARED  ${SRCS_common})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxCommon
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
   PRIVATE
     RTI::nddscpp2
@@ -45,7 +44,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
     ddscore
     NGLLogger
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxCommon)
 
 #
@@ -57,14 +55,13 @@ SET(SRCS_client
 # generate xxx_[d|f]tc.h, xxx_[d|f]tc_impl.[cpp|h]
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcXxxClient SHARED ${SRCS_client})
+NGL_ADD_LIBRARY(AAR SV WS svcXxxClient SHARED ${SRCS_client})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxClient
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxClient
   PRIVATE
     RTI::nddscpp2
@@ -73,7 +70,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxClient
     svcXxxCommon
     ddsftc
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxClient)
 
 #
@@ -87,14 +83,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
 # Generate xxx_db_impl.cpp/.h, xxx_db.h
 CODEGEN_DATABASE(SRCS_server ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV svcXxxServer SHARED ${SRCS_server})
+NGL_ADD_LIBRARY(AAR SV svcXxxServer SHARED ${SRCS_server})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxServer
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcXxxServer
   PRIVATE
     RTI::nddscpp2
@@ -104,7 +99,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxServer
   PUBLIC
     svcXxxCommon
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcXxxServer)
 
 #

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp

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

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h

@@ -45,12 +45,13 @@ public:
   }
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<DTS::CurrentRunningState>   m_dtsCurrentRunningState;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
   std::shared_ptr<XxxXxxXxx::Interface::Dts>  m_ddsDts;
   std::shared_ptr<XxxXxxXxx::Interface::Fts>  m_ddsFts;
+
+  NGL::INGLLogger          &m_logger;
 };
 
 } // namespace XxxXxxXxx

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/logger.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include "svcxxxcommon_export.h"
+#include "xxx_export.h"
 
 namespace XxxXxxXxx
 {

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp

@@ -13,10 +13,12 @@
 namespace XxxXxxXxx
 {
 
-MainHandler::MainHandler(QObject *parent) : QObject(parent)
+MainHandler::MainHandler(QObject *parent)
+  : QObject(parent)
   , m_ddsHandler(nullptr)
-  , m_dbHandler(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+  , m_dbHandler(nullptr)
+  , m_logger(getLogger("MainHandler"))
+{}
 
 MainHandler::~MainHandler()
 {

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h

@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <memory>
 #include "dds_handler.h"
 #include "xxx_db.h"
@@ -33,8 +33,10 @@ public:
   std::shared_ptr<DatabaseInterface> db() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
+
+  NGL::INGLLogger                       &m_logger;
+
 };
 } // namespace XxxXxxXxx

qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h

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