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
@@ -20,7 +20,6 @@ SET(SRCS

 NGL_ADD_LIBRARY(AAR SV cesPluginTargetAreas MODULE ${SRCS})
 NGL_INSTALL_TARGET(cesPluginTargetAreas)
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
  Qt6::Core
  Qt6::Widgets
@@ -33,5 +32,4 @@ NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
  LtsCoordTrans
  svcCoreClient
 )
-ENDIF(BUILD_RTI)

@@ -13,10 +13,12 @@
 namespace TargetAreas
 {

-DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
+DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId)
+  : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
  , m_participantEventId(0)
-  , m_exerciseId(exerciseId),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_exerciseId(exerciseId)
+  , m_logger(getLogger("DdsHandlerTargetAreas"))
+{
  DEBUG_LOG(m_logger) << "DdsHandlerTargetAreas(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -7,11 +7,11 @@
  */
 #pragma once

-#include <QtCore/QObject>
+#include <QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/core_dtc.h>
 #include <DDS/Core/topic_lock_master.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <TrainingAreaBase/tab_ftc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
@@ -53,8 +53,6 @@ private Q_SLOTS:
  void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);

 private:
-
-NGL::INGLLogger &m_logger;
  std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
  std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
  std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
@@ -64,6 +62,8 @@ NGL::INGLLogger &m_logger;
  QMap<int, int>                                         m_partId2EquipNoMap; ///< Reference map participant (player) to equipment number
  int                                          m_participantEventId;
  int                                          m_exerciseId;
+
+  NGL::INGLLogger                             &m_logger;
 };

 }
@@ -11,8 +11,8 @@
 #include <ParticipantManagement/ppm_common.h>

 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QLineF>
-#include <QtCore/QDateTime>
+#include <QLineF>
+#include <QDateTime>


 namespace TargetAreas
@@ -22,6 +22,7 @@ HandlerTargetAreas::HandlerTargetAreas(const std::shared_ptr<DdsHandlerTargetAre
                                       QObject *parent)
  : QObject(parent)
  , m_ddsHandler(ddsHandler)
+  , m_logger(getLogger("HandlerTargetAreas"))
 {
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -8,7 +8,7 @@

 #pragma once

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

@@ -17,7 +17,7 @@
 #include <CentralEffectSimulation/point_helpers.h>


-#include <LtsUtils/LtsUtilsCore/outdated_position.h>
+#include <LtsUtilsCore/outdated_position.h>

 #include <QtCore/QObject>
 #include <QtCore/QMap>
@@ -62,7 +62,6 @@ public:

  };
 protected:
-  NGL::INGLLogger &m_logger;
  void onSendControlDataReply(const Core::FunctionReplyObject &reply) override final;
  void onSendCesHitInformationReply(const Core::FunctionReplyObject &reply) override final;
  void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -124,7 +123,7 @@ private: // attributes

  QHash<int, TrainingAreaBase::SendControlDataRequest>        m_requestMap; // Key = equipmentNumber

-
+  NGL::INGLLogger &m_logger;           ///< Interface to the Logging-Facility
 };
 } // namespace TargetAreas

@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-#include "cesplugintargetareas_export.h"
+#include <CentralEffectSimulation/ces_export.h>

 namespace TargetAreas
 {
@@ -26,7 +26,7 @@ TargetAreasInterfaceImpl::TargetAreasInterfaceImpl(CentralEffectSimulation::Plug
                                                   NGL::Settings *settings)
  : m_pdp(pdp)
  , m_ddsConnector(dDSConnector)
-  .getNGLLogger("CES.Plugin.TargetAreasInterfaceImpl"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.TargetAreasInterfaceImpl"))
 {
  Q_UNUSED(settings)
 }
@@ -8,7 +8,7 @@

 #pragma once

-#include <QtCore/QObject>
+#include <QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <CentralEffectSimulation/ces_plugin_interface.h>
 #include <NGLLogger/INGLLogger.h>
@@ -48,12 +48,12 @@ private Q_SLOTS:
  bool init(int domain_id, int exerciseId) override;
 private:

-NGL::INGLLogger &m_logger;
 private:
  CentralEffectSimulation::Plugin::DataProvider *m_pdp;
  std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
  std::shared_ptr<HandlerTargetAreas> m_handlerTargetAreas;
  std::shared_ptr<DdsHandlerTargetAreas> m_ddsHandlerTargetAreas;
+  NGL::INGLLogger &m_logger;
  int m_domainId;
  int m_exerciseId;
 };
@@ -8,7 +8,7 @@


 #include "targettimer.h"
-#include <QtCore/QDebug>
+#include <QDebug>

 TargetTimer::TargetTimer(int participantId,
                         int targetParticipantId,
@@ -20,8 +20,8 @@ TargetTimer::TargetTimer(int participantId,
  m_preWarningInterval = preWarningInterval;
  m_timeToEffectInterval = timeToEffectInterval;
  timer = new QTimer(this);
-  connect(timer, &QTimer::timeout,
-          this, &TargetTimer::MyTimerSlot);
+  connect(timer, SIGNAL(timeout()),
+          this, SLOT(MyTimerSlot()));

  // msec
 }
@@ -11,8 +11,8 @@
 #define TARGETTIMER_H


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

 class TargetTimer: public QObject
 {