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>
2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
@@ -32,13 +32,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 # generate msg_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})

-NGL_ADD_LIBRARY2(AAR SV WS svcMsgCommon SHARED  ${SRCS_common})
+NGL_ADD_LIBRARY(AAR SV WS svcMsgCommon SHARED  ${SRCS_common})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgCommon
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../
    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgCommon
  PRIVATE
    RTI::nddscpp2
@@ -49,7 +48,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgCommon
    LtsCommandLineParser
    NGLLogger
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgCommon)

 #
@@ -61,14 +59,13 @@ SET(SRCS_client
 # generate msg_[d|f]tc_impl.[cpp|h]
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})

-NGL_ADD_LIBRARY2(AAR SV WS svcMsgClient SHARED ${SRCS_client})
+NGL_ADD_LIBRARY(AAR SV WS svcMsgClient SHARED ${SRCS_client})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgClient
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../
    ${CMAKE_CURRENT_BINARY_DIR}/../
 )

-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgClient
  PRIVATE
    RTI::nddscpp2
@@ -77,7 +74,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgClient
    svcMsgCommon
    ddsftc
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgClient)

 #
@@ -89,14 +85,13 @@ SET(SRCS_server
 # generate msg_[d|f]ts.h, msg_[d|f]ts_impl.[cpp|h]
 CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})

-NGL_ADD_LIBRARY2(AAR SV svcMsgServer SHARED ${SRCS_server})
+NGL_ADD_LIBRARY(AAR SV svcMsgServer SHARED ${SRCS_server})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgServer
  PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../
    ${CMAKE_CURRENT_BINARY_DIR}/../
 )

-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcMsgServer
  PRIVATE
    RTI::nddscpp2
@@ -106,7 +101,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMsgServer
    svcMsgCommon
    ngldb
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcMsgServer)

 #
@@ -9,8 +9,8 @@

 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
+#include <QTimer>
+#include <QDateTime>

 #include <Messaging/msg_ftc.h>

@@ -52,6 +52,7 @@ MsgTests::MsgTests(QObject *parent)
  , m_msgIdRecvMessage(3) // Result from last test
  , m_numberMessages(3)   // Result from last test
  , m_testStep(TestCase::CreateOperator)
+  , m_logger(getLogger("MsgTests"))
 {}

 MsgTests::~MsgTests()
@@ -52,7 +52,6 @@ protected Q_SLOTS:
  void markMessageAsRead();
  void markMessageAsDeleted();
 protected:
-  NGL::INGLLogger &m_logger;
  void onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject) override final;
  void onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject) override final;

@@ -72,6 +71,9 @@ private:
  int m_msgIdRecvMessage;
  int m_numberMessages;
  TestCase m_testStep;
+
+  NGL::INGLLogger &m_logger;
+
 };

 } // namespace Messaging
@@ -15,6 +15,7 @@ namespace Messaging

 DdsHandler::DdsHandler(int domainId)
  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises))
+  , m_logger(getLogger("DdsHandler"))
 {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()DdsHandler
@@ -11,7 +11,7 @@
 #include <DDS/Core/topic_lock_master.h>
 #include <DDS/Core/core_dtc.h>

-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>

 #include <Messaging/msg_dts.h>
 #include <Messaging/msg_fts.h>
@@ -44,13 +44,14 @@ public:
 private:


-  NGL::INGLLogger &m_logger;
  std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
  std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
  std::shared_ptr<Core::Pacemaker>            m_pacemaker;
  std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
  std::shared_ptr<Messaging::Interface::Dts>  m_ddsDts;
  std::shared_ptr<Messaging::Interface::Fts>  m_ddsFts;
+
+  NGL::INGLLogger          &m_logger;
 };

 }
@@ -16,6 +16,7 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainId(), IDL::PartitionType::Exercise, exerciseId))
  , m_exerciseId(exerciseId)
  , m_idleTimer(new QTimer(this))
+  , m_logger(getLogger("ExerciseHandler"))
 {
  connect(m_idleTimer, &QTimer::timeout,
          this, &ExerciseHandler::exerciseHandlerIdleTimeout);
@@ -10,8 +10,8 @@

 #include "dds_handler.h"
 #include "logger.h"
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
 #include <TrainingAreaBase/tab_ftc.h>
 #include <OcSituationServer/oss_ftc.h>

@@ -35,15 +35,14 @@ Q_SIGNALS:
  void equipmentMessageReply(int msgId, bool sentSuccessful);
  void equipmentMessageOcReply(int replyId, bool sentSuccessful);
 private:
-  NGL::INGLLogger &m_logger;
  void onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject) override;
  void onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject) override;
 private:
-  NGL::INGLLogger &m_logger;
  std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
  std::shared_ptr<TrainingAreaBase::Interface::Ftc> m_tabFtc;
  std::shared_ptr<OcSituationServer::Interface::Ftc> m_ossFtc;
  int m_exerciseId;
  QTimer *m_idleTimer;  //<! timer to delete ExerciseHandler after n seconds when no longer needed
+  LOGGER_T m_logger;
 };
 } // namespace Messaging
@@ -19,6 +19,7 @@ namespace Messaging
 {
 ExercisesHandler::ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler)
  : m_ddsHandler(ddsHandler)
+  , m_logger(getLogger("ExercisesHandler"))
 {
 }

@@ -11,9 +11,9 @@
 #include "dds_handler.h"
 #include "logger.h"

-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <ParticipantManagement/ppm.hpp>
+#include <QObject>
+#include <QHash>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <OcSituationServer/oss_dtc.h>
 #include <TrainingAreaBase/tab.hpp>
 #include <DDS/DDSConnector/dds_connector.h>
@@ -40,15 +40,14 @@ private Q_SLOTS:
  void onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType);
  void onExerciseHandlerIdleTimeout();
 private:
-  NGL::INGLLogger &m_logger;
  ExerciseHandler *exerciseHandlerForExerciseId(int exerciseId);
 private:
-  NGL::INGLLogger &m_logger;
  std::shared_ptr<DdsHandler> m_ddsHandler;
  std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
  QHash<int, ExerciseHandler *> m_exerciseHandler;
  // QHash< QPair<exerciseId,ParticipantId>, equipmentNumber>
  QHash<QPair<int,int>, int> m_participant2EquipNumber;
  QHash<int, int> m_equipNo2ExerciseId;
+  LOGGER_T m_logger;
 };
 } // namespace Messaging
@@ -21,6 +21,7 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
  , m_ddsHandler(ddsHandler)
  , m_db(db)
  , m_exercisesHandler(exercisesHandler)
+  , m_logger(getLogger("HandlerOperatorMessage"))
 {
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -8,7 +8,7 @@

 #pragma once

-#include <QtCore/QObject>
+#include <QObject>
 #include "dds_handler.h"
 #include "exercises_handler.h"
 #include "logger.h"
@@ -43,8 +43,6 @@ private Q_SLOTS:
  void onOperatorChanged(const OperatorManagement::User &data);

 private: // methods
-
-NGL::INGLLogger &m_logger;
  void onCreateOperatorMessageRequest(const rti::core::SampleIdentity &cookie,
                                      const CreateOperatorMessageRequest &request) override;
  Core::FunctionReplyObject createOperatorMessageRequest(const CreateOperatorMessageRequest &request);
@@ -66,6 +64,8 @@ private: // attributes
  std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
  //std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
  QMap<int, std::string>                       m_operatorMap;
+  NGL::INGLLogger                             &m_logger;
+
  static const unsigned int                    m_maxSubjectLength = 80;
  static const unsigned int                    m_maxOcContentLength = 1024;
 };
@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-#include "svcmsgcommon_export.h"
+#include "msg_export.h"

 namespace Messaging
 {
@@ -33,13 +33,11 @@ public:
  bool init(int domainId);

 private: // attributes
-
-NGL::INGLLogger &m_logger;
  std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to DDS handler
  std::shared_ptr<DbHandler>                 m_dbHandler;                 ///< Pointer to DB handler
  std::shared_ptr<ExercisesHandler>          m_exercisesHandler;          ///<Messages from OC
  std::shared_ptr<HandlerOperatorMessage>    m_handlerOperatorMessage;    ///< Messages between Operators / O/C
-
+  NGL::INGLLogger                           &m_logger;                    ///< Interface to the Logging-Facility

 };
 } // namespace MessagingDataManagement
@@ -6,7 +6,7 @@
  */

 #pragma once
-#include <QtCore/QString>
+#include <QString>

 namespace NGL
 {