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

@@ -33,7 +33,7 @@ SET(SRCS
 # make sure xml file is properly installed
 CODEGEN_HANDLE_SVC_XML(SRCS ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV svcGmpServer SHARED ${SRCS})
+NGL_ADD_LIBRARY(AAR SV svcGmpServer SHARED ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(svcGmpServer
   Qt6::Core
   svcAesClient

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.cpp

@@ -9,8 +9,8 @@
 
 #include "gmp_minefieldInterpreter_test.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
+#include <QCoreApplication>
+#include <QDateTime>
 #include <QtTest/QTest>
 
 #include <NGLLogger/NGLLoggerBootstrap.h>
@@ -39,12 +39,12 @@ int main(int argc, char *argv[])
 
 //-------------------------------------------------------------------------------------------------------
 GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain()
-  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
-  , m_minefieldInterpreter(nullptr)
+  : m_minefieldInterpreter(nullptr)
   , m_receivedMinefield()
   , m_receivedVeType(0)
   , m_minefieldInterpreterTimer(nullptr)
   , m_minefieldSpy(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Tests.GmpMinefieldInterpreterTest"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/UnitTests/gmp_minefieldInterpreter_test.h

@@ -8,10 +8,10 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
 #include <QSignalSpy>
-#include <QtCore/QPair>
+#include <QPair>
 
 #include "../zssi_wi_Minenfeld_Interpreter.h"
 
@@ -37,8 +37,6 @@ private slots:
   void onSendMinefield(const wirkfeld_minensperre_rt &minefield, int veType);
 
 private:
-
-NGL::INGLLogger &m_logger;
   GuezMinelayerProcessing::ZSSI_WI_Minenfeld_Interpreter *m_minefieldInterpreter;
 
   wirkfeld_minensperre_rt m_receivedMinefield;
@@ -46,4 +44,5 @@ NGL::INGLLogger &m_logger;
 
   QTimer          *m_minefieldInterpreterTimer;
   QSignalSpy      *m_minefieldSpy;
+  NGL::INGLLogger &m_logger;
 };

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp

@@ -8,32 +8,20 @@
 
 #include "dds_handler.h"
 
-#if BUILD_RTI
 #include <DDS/Core/pacemaker.h>
-#endif
 
 namespace GuezMinelayerProcessing
 {
 
-#if BUILD_RTI
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
-  , m_logger(getLogger("GuezMinelayerProcessing.DdsHandler"))
-  , m_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
+  , m_logger(getLogger("DdsHandler"))
 {
   DEBUG_LOG(m_logger) << "DdsHandler(" << ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
-#else
-DdsHandler::DdsHandler()
-  : m_logger(getLogger("GuezMinelayerProcessing.DdsHandler"))
-{
-  DEBUG_LOG(m_logger) << "DdsHandler() - RTI DDS not enabled";
-}
-#endif
 
 bool DdsHandler::init(const QStringList &qosFileList)
 {
-#if BUILD_RTI
   if (!m_ddsConnector->init(qosFileList))
   {
     ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
@@ -42,10 +30,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
   // default initialize Publisher and Subscriber
   m_ddsConnector->initPublisherSubscriber();
-#else
-  Q_UNUSED(qosFileList)
-  DEBUG_LOG(m_logger) << "DdsHandler::init() - RTI DDS not enabled, skipping initialization";
-#endif
 
   return true;
 }

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h

@@ -7,10 +7,8 @@
   */
 #pragma once
 
-#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/topic_lock_master.h>
-#endif
 #include "logger.h"
 
 namespace GuezMinelayerProcessing
@@ -18,26 +16,18 @@ namespace GuezMinelayerProcessing
 class DdsHandler final
 {
 public:
-#if BUILD_RTI
   explicit DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
-#else
-  explicit DdsHandler();
-#endif
   ~DdsHandler() = default;
 
   bool init(const QStringList &qosFileList = QStringList());
 
-#if BUILD_RTI
   std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
   std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }
-#endif
 
 private:
-  NGL::INGLLogger &m_logger;
-#if BUILD_RTI
   std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>            m_topicLockMaster;
-#endif
+  NGL::INGLLogger          &m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.cpp

@@ -9,18 +9,14 @@
 
 #include "handler_minelayer_data.h"
 
-#if BUILD_RTI
 #include <AreaEffectSimulation/aes_ftc.h>
-#endif
 #include <AssetManagement/asm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>
 
 #include "dds_handler.h"
 #include "zssi_wi_Minenfeld_Interpreter.h"
 
-#include <QtCore/QLineF>
-
-#if BUILD_RTI
+#include <QLineF>
 
 namespace GuezMinelayerProcessing
 {
@@ -28,15 +24,13 @@ namespace GuezMinelayerProcessing
 HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
                                            QObject *parent)
   : QObject(parent)
-  , m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
   , m_ddsHandler(ddsHandler)
-#if BUILD_RTI
   , m_tabDtc(nullptr)
   , m_ppmDtc(nullptr)
   , m_aesFtc(nullptr)
-#endif
   , m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
   , m_minefieldInterpreterTimer(new QTimer(this))
+  , m_logger(getLogger("HandlerMinelayerData"))
 {}
 
 HandlerMinelayerData::~HandlerMinelayerData()
@@ -44,24 +38,19 @@ HandlerMinelayerData::~HandlerMinelayerData()
 
 bool HandlerMinelayerData::init()
 {
-#if BUILD_RTI
   // AES-Ftc
   m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
   bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
   if (!ret)
   {
-    ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaModifyFromCtaData()";
+    ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
     return false;
   }
-#endif
 
 
   // Data from training area base
   m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->ddsConnector());
-  bool ret = true;
-#if BUILD_RTI
   ret &= m_tabDtc->enableSpecialSensorData();
-#endif
   ret &= m_tabDtc->enableMinelayerTrailerData();
   ret &= m_tabDtc->enableMinelayerThrowerData();
   if (!ret)
@@ -70,17 +59,13 @@ bool HandlerMinelayerData::init()
     return false;
   }
 
-#if BUILD_RTI
   connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::specialSensorDataChanged, this, &HandlerMinelayerData::onSpecialSensorDataChanged);
-#endif
   connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerTrailerDataChanged, this, &HandlerMinelayerData::onMinelayerTrailerData);
   connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerThrowerDataChanged, this, &HandlerMinelayerData::onMinelayerThrowerData);
 
   // PPM for partyId Mapping
   m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
-#if BUILD_RTI
   ret &= m_ppmDtc->enableParticipant();
-#endif
   if (!ret)
   {
     ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
@@ -98,7 +83,7 @@ bool HandlerMinelayerData::init()
   return ret;
 }
 
-void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType)
+void HandlerMinelayerData::onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType)
 {
   if (modType != DataModification::eAdded &&
       modType != DataModification::eModified)
@@ -159,7 +144,7 @@ void HandlerMinelayerData::convertMinelayerDataToXdrData(const TrainingAreaBase:
   outData.verlegedaten.anzahl_verlegter_minen = inData.mineCount();
 }
 
-void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType)
+void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType)
 {
   if ((modType == DataModification::eAdded) ||
       (modType == DataModification::eModified))
@@ -202,7 +187,7 @@ void HandlerMinelayerData::onMinelayerTrailerData(const TrainingAreaBase::Minela
   }
 }
 
-void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType)
+void HandlerMinelayerData::onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType)
 {
   if ((modType == DataModification::eAdded) ||
       (modType == DataModification::eModified))
@@ -306,7 +291,6 @@ static inline double compassFromMathAngleForSfm(int mathAngle)
 
 void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt)
 {
-#if BUILD_RTI
   AreaEffectSimulation::MineArea outData;
   outData.participantId(minefield.header.identitaet);
   outData.partyId(partyIdFromEquipmentNumber(minefield.header.identitaet)); // Get from PPM;
@@ -349,7 +333,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi
 
   // request create mine area from aes
   m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
-#endif
+
 }
 
 void HandlerMinelayerData::onStartMinefieldInterpreter()
@@ -366,23 +350,4 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
     INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
 }
 
-} // namespace GuezMinelayerProcessing
-
-#else // BUILD_RTI
-
-namespace GuezMinelayerProcessing
-{
-
-HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                                           QObject *parent)
-  : QObject(parent)
-  , m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
-  , m_ddsHandler(ddsHandler)
-{}
-
-HandlerMinelayerData::~HandlerMinelayerData()
-{}
-
-} // namespace GuezMinelayerProcessing
-
-#endif // BUILD_RTI
+}

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/handler_minelayer_data.h

@@ -8,27 +8,22 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointF>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QPointF>
+#include <QTimer>
 
+#include <AreaEffectSimulation/aes_ftc.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <Proxies/TrainingAreaBase/tab_dtc.h>
 #include "GFS_map_cont.h"
 
 #include "logger.h"
 
-#if BUILD_RTI
-#include <AreaEffectSimulation/aes_ftc.h>
-#include <Proxies/TrainingAreaBase/tab_dtc.h>
-#endif
-
 namespace GuezMinelayerProcessing
 {
 class DdsHandler;
 class ZSSI_WI_Minenfeld_Interpreter;
-
-#if BUILD_RTI
 class HandlerMinelayerData : public QObject
     , protected AreaEffectSimulation::Interface::Ftc::MineAreaModifyFromCtaDataReplyHandler
 {
@@ -43,14 +38,13 @@ public:
   void onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject) override final;
 
 private slots:
-  void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType);
-  void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType);
-  void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType);
+  void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType);
+  void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType);
+  void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType);
   void onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt);
   void onStartMinefieldInterpreter ();
 
 private:
-  NGL::INGLLogger &m_logger;
   template<typename T>
   void convertMinelayerDataToXdrData(const TrainingAreaBase::MinelayerTrailerData &inData, T &outData);
   Core::GeoPosition2D geographicFromRelative(const gps_position_rt &position) const;
@@ -66,23 +60,8 @@ private:
 
   ZSSI_WI_Minenfeld_Interpreter *m_minefieldInterpreter;
   QTimer                        *m_minefieldInterpreterTimer;
+
+  NGL::INGLLogger            &m_logger;
+
 };
-#else
-// Stub implementation when BUILD_RTI is OFF
-class HandlerMinelayerData : public QObject
-{
-  Q_OBJECT
-public:
-  explicit HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                                QObject *parent = nullptr);
-  ~HandlerMinelayerData();
-
-  bool init() { return false; }
-
-private:
-  NGL::INGLLogger &m_logger;
-  std::shared_ptr<DdsHandler> m_ddsHandler;
-};
-#endif // BUILD_RTI
-
 } // namespace GuezMinelayerProcessing

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.cpp

@@ -9,35 +9,24 @@
 #include "dds_handler.h"
 #include "handler_minelayer_data.h"
 
-#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
-#endif
 
 using namespace GuezMinelayerProcessing;
 
 Initialization::Initialization()
-  : m_logger(getLogger("GuezMinelayerProcessing.Initialization"))
-  , m_ddsHandler(nullptr)
-#if BUILD_RTI
+  : m_ddsHandler(nullptr)
   , m_handlerMinelayerData(nullptr)
-#endif
+  , m_logger(getLogger("Initialization"))
 {}
 
 Initialization::~Initialization()
 {
-#if BUILD_RTI
   m_handlerMinelayerData = nullptr;
-#endif
   m_ddsHandler = nullptr;
 }
 
-bool Initialization::initialize(
-#if BUILD_RTI
-  const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
-#endif
-)
+bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
 {
-#if BUILD_RTI
   if (m_handlerMinelayerData)
     return true;
 
@@ -56,15 +45,6 @@ bool Initialization::initialize(
     ERROR_LOG(m_logger) << "Initialisation m_handlerMinelayerData failed.";
     return false;
   }
-#else
-  // initialize DDS stub
-  m_ddsHandler.reset(new DdsHandler());
-  if (!m_ddsHandler->init())
-  {
-    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
-    return false;
-  }
-#endif
 
   return true;
 }

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/initialization.h

@@ -6,19 +6,15 @@
   */
 #pragma once
 
-#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
-#endif
 #include <ngldb/db_service_handler.h>
-#include "svcgmpserver_export.h"
+#include <GuezMinelayerProcessing/gmp_export.h>
 #include "logger.h"
 
 namespace GuezMinelayerProcessing
 {
 class DdsHandler;
-#if BUILD_RTI
 class HandlerMinelayerData;
-#endif
 
 class GMP_SERVER_EXPORT Initialization final
 {
@@ -26,18 +22,14 @@ public:
   Initialization();
   ~Initialization();
 
-  bool initialize(
-#if BUILD_RTI
-    const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
-#endif
-  );
+  bool initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
   bool loadFromDatabase();
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>           m_ddsHandler;
-#if BUILD_RTI
   std::shared_ptr<HandlerMinelayerData> m_handlerMinelayerData;
-#endif
+
+  NGL::INGLLogger            &m_logger;
+
 };
 } // namespace GuezMinelayerProcessing

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/settings.h

@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QtCore/QString>
-#include "gmp_export.h"
+#include <QString>
+#include <GuezMinelayerProcessing/gmp_export.h>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.cpp

@@ -46,7 +46,7 @@ static char rcs_id[] = "$Id$";
 
 //------------------ includes ------------------------------
 
-#include <QtCore/QString>
+#include <QString>
 
 #include <stdio.h>
 #include <iostream>

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Generator.h

@@ -48,7 +48,7 @@
 #define ZSSI_WI_MINENFELD_GENERATOR_H
 
 /*------------------ includes ----------------------------*/
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "GFS_map_cont.h"
 

qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/zssi_wi_Minenfeld_Interpreter.h

@@ -45,7 +45,7 @@
 
 /*------------------ includes ----------------------------*/
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "GFS_map_cont.h"
 #include "zssi_wi_Minenfeld_Generator.h"