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 gim_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})

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

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

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

-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGimClient
  PRIVATE
    RTI::nddscpp2
@@ -79,7 +76,6 @@ NGL_TARGET_LINK_LIBRARIES(svcGimClient
    svcGimCommon
    ddsftc
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGimClient)

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

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

-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcGimServer
  PRIVATE
    RTI::nddscpp2
@@ -108,7 +103,6 @@ NGL_TARGET_LINK_LIBRARIES(svcGimServer
    svcGimCommon
    ngldb
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcGimServer)

 #
@@ -15,6 +15,7 @@ namespace GuezIedManagement

 DdsHandler::DdsHandler(int domainId, int exerciseId)
  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
+  , m_logger(getLogger("DdsHandler"))
 {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
@@ -36,12 +36,13 @@ public:
  std::shared_ptr<DDSConnector::DdsConnector> dds() const { return m_ddsConnector; }

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

 } // namespace GuezIedManagement
@@ -7,14 +7,13 @@
  */

 #include "handler_ied.h"
-#include <utility>
 #include "object_ied.h"
 #include "main_handler.h"
 #include "gim_db.h"

 #include <Proxies/TrainingAreaBase/tab_dtc.h>

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>
@@ -35,6 +34,7 @@ HandlerIed::HandlerIed(MainHandler *mainHandler,
  , m_tabDtc(nullptr)
  , m_ppmDtc(nullptr)
  , m_db(db)
+  , m_logger(getLogger("HandlerIed"))
 {}

 HandlerIed::~HandlerIed()
@@ -75,7 +75,7 @@ bool HandlerIed::init()
  }

  // create Ied objects
-  for (const Database::GimIed &data : std::as_const(dataVec))
+  for (const Database::GimIed &data : qAsConst(dataVec))
  {
    ObjectIed *ifs(new ObjectIed(m_ddsHandler, m_db, m_ppmDtc, this));
    Core::FunctionReplyObject ret = ifs->createObject(data);
@@ -8,7 +8,7 @@
 #pragma once

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

 #include "dds_handler.h"
 #include "logger.h"
@@ -38,14 +38,12 @@ private slots:
  void onStateIed(const TrainingAreaBase::StateIed &data, DataModification modType);

 private:
-  NGL::INGLLogger &m_logger;
  void onPairIedRequest(const rti::core::SampleIdentity &cookie,
                        const PairIedRequest &request) override;
  int getIdByEquipmentnumber(const int number) const;
  int getPartyIdFromParticipantEquipmentNumber(const int equipmentNumber) const;

 private:
-  NGL::INGLLogger &m_logger;
  QMap<int, ObjectIed *>       m_iedObjMap;
  QMap<int, TrainingAreaBase::StateIed> m_orphanedStateIed;
  MainHandler                 *m_mainHandler;
@@ -53,5 +51,7 @@ private:
  std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc;
  std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
  std::shared_ptr<DatabaseInterface> m_db;
+  NGL::INGLLogger             &m_logger;
+
 };
 }
@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-#include "svcgimcommon_export.h"
+#include "gim_export.h"

 namespace GuezIedManagement
 {
@@ -21,14 +21,16 @@

 using namespace GuezIedManagement;

-MainHandler::MainHandler() : m_handlerIed(nullptr)
+MainHandler::MainHandler()
+  : m_handlerIed(nullptr)
  , m_ddsHandler(nullptr)
  , m_dbHandler(nullptr)
  , m_codService(nullptr)
  , m_esmService(nullptr)
  , m_gmpService(nullptr)
-  , m_exerciseId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
+  , m_exerciseId(0)
+  , m_logger(getLogger("MainHandler"))
+{}

 MainHandler::~MainHandler()
 {
@@ -7,7 +7,7 @@
  */
 #pragma once

-#include <QtCore/QObject>
+#include <QObject>
 #include <memory>

 #include "dds_handler.h"
@@ -47,10 +47,8 @@ public:
  bool loadFromDatabase();

 private:
-  NGL::INGLLogger &m_logger;
  QString initInternal(int domainId, int exerciseId);
 private:
-  NGL::INGLLogger &m_logger;
  std::shared_ptr<HandlerIed> m_handlerIed;
  std::shared_ptr<DdsHandler> m_ddsHandler;
  std::shared_ptr<DbHandler>  m_dbHandler;
@@ -60,5 +58,8 @@ private:
  GuezMinelayerProcessing::Initialization *m_gmpService;

  int m_exerciseId;
+
+  NGL::INGLLogger            &m_logger;
+
 };
 } // namespace GuezIedProcessing
@@ -24,6 +24,7 @@ ObjectIed::ObjectIed(const std::shared_ptr<DdsHandler> &ddsHandler,
  , m_ddsHandler(ddsHandler)
  , m_db(db)
  , m_ppmDtc(ppmDtc)
+  , m_logger(getLogger("ObjectIed"))
 {
 }

@@ -6,12 +6,12 @@
  */
 #pragma once

-#include <QtCore/QObject>
+#include <QObject>
 #include "dds_handler.h"
 #include "logger.h"

-#include <Core/core_types.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <DDS/Core/function_reply_object.h>
+#include <ParticipantManagement/ppm_dtc.h>

 // Generated
 #include <GuezIedManagement/gim_db.h>
@@ -47,7 +47,6 @@ private slots:
  void onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType);

 private:
-  NGL::INGLLogger &m_logger;
  void assignBaseData(const Database::GimIed &data);
  void assignPairingState(const Database::GimIed &data);
  Core::FunctionReplyObject updateObject();
@@ -60,5 +59,8 @@ private:
  std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
  Database::GimIed   m_data;
  IedPosition m_position;
+
+  NGL::INGLLogger &m_logger;
+
 };
 }
@@ -6,7 +6,7 @@
  */

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

 namespace NGL
 {