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
@@ -97,7 +97,7 @@ private:
  QString                           m_ammunitionFile;
  N_ConfigSystem::AmmuConfig       *m_ammuConfig = nullptr;

-  CesGeoPairing::
+  CesGeoPairing::LOGGER_T m_logger;
 };

 }
@@ -140,6 +140,9 @@ protected:
  /**
   * logger object
   */
+  NGL::INGLLogger &m_logger;
+
+
  /**
   * deinitializes class
   */
@@ -224,6 +224,8 @@ protected:
  /**
   * logger object
   */
+  NGL::INGLLogger &m_logger;
+
  /**
   * deinitializes the class
   */
@@ -7,7 +7,7 @@
  */

 #include "ammuconfig.h"
-#include <QtCore/QStringList>
+#include <QStringList>

 namespace N_ConfigSystem
 {
@@ -1,7 +1,7 @@
 #pragma once

-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QString>
+#include <QVector>
 #include "configsettings.h"
 #include <FW_Ballistic/Ammunition.hpp>

@@ -1,10 +1,10 @@
 #ifndef CONFIGSETTINGS_H
 #define CONFIGSETTINGS_H

-#include <QtCore/QString>
-#include <QtCore/QSettings>
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QSettings>
+#include <QVector>
+#include <QStringList>

 class ConfigSettings
 {
@@ -7,7 +7,7 @@
  */

 #include "geoconfig.h"
-#include <QtCore/QFileInfo>
+#include <QFileInfo>

 namespace N_ConfigSystem
 {
@@ -30,7 +30,7 @@ GeoConfig *GeoConfig::getInstance()
 bool GeoConfig::initFilename(const QString &fileName)
 {
 //  const QFileInfo qFileInfo(fileName);
-//  INFO_LOG(m_logger) << Q_FUNC_INFO << " START, GeoConfig::absoluteFilePath ='" << qFileInfo.absoluteFilePath() << "'";
+//  INFO_LOG(m_logger) << LOGFUNCTION << " START, GeoConfig::absoluteFilePath ='" << qFileInfo.absoluteFilePath() << "'";

  // AmmunitionMap
  ConfigSettings::initFilename(fileName);
@@ -41,7 +41,7 @@ bool GeoConfig::initFilename(const QString &fileName)

  const QStringList &filePaths_rough_to_fine = elevationName.split(QStringLiteral(";"));

-//  INFO_LOG(m_logger) << Q_FUNC_INFO << " use following file(s) for ElevationMap: '" << elevationName << "'";
+//  INFO_LOG(m_logger) << LOGFUNCTION << " use following file(s) for ElevationMap: '" << elevationName << "'";

  if (!m_elevationMapManager)
  {
@@ -49,7 +49,7 @@ bool GeoConfig::initFilename(const QString &fileName)
    m_elevationMapManager->init(filePaths_rough_to_fine);
  }

-//  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, filename ='" << fileName << "'";
+//  TRACE_LOG(m_logger) << LOGFUNCTION << " END, filename ='" << fileName << "'";
  return true;
 }

@@ -13,7 +13,7 @@
 //#include "../logger.h"

 #include <ElevationMap/elevation_map_manager.h>
-#include <QtCore/QString>
+#include <QString>

 #include <iostream> // std::cout, std::endl, std::cin
 #include <stdlib.h>   // EXIT_SUCCESS
@@ -37,7 +37,6 @@ namespace N_ConfigSystem
 class GeoConfig: public ConfigSettings
 {
 private:
-  NGL::INGLLogger &m_logger;
  explicit GeoConfig();
  ~GeoConfig();
 public:
@@ -49,7 +48,6 @@ public:
  double getElevation(const double lon, const double lat) const;

 private:
-  NGL::INGLLogger &m_logger;
  friend class CesGeoPairing::HandlerGeoPairing;  // for initFilename
  bool initFilename(const QString &fileName);

@@ -59,6 +57,6 @@ private:

  std::shared_ptr<SituationMap::ElevationMapManager> m_elevationMapManager;

-//  CesGeoPairing::
+//  CesGeoPairing::LOGGER_T m_logger;
 };
 }
@@ -13,7 +13,7 @@

 #include "GeoCoord.hpp"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QPointF>
+#include <QPointF>

 namespace N_Math
 {
@@ -13,7 +13,7 @@
 #include <GeoPairingImpl/GeoPairingImplBalistic.hpp>
 #include <GeoPairingImpl/GeoPairingDataFireReport.hpp>
 #include <Schusstafel.h>
-#include <QtCore/QScopedPointer>
+#include <QScopedPointer>
 #include <FW_Ballistic/AmmunitionTypes.hpp>
 #include <GBL_ConfigSystem/ammuconfig.h>
 #include "../settings.h"
@@ -181,6 +181,9 @@ private:
  SingleFireToCtas m_singleFireToCtas;
  AreaFireToCtas m_areaFireToCtas;
  ReportTarget m_reportTarget;
+
+  NGL::INGLLogger &m_logger;
+
  void calculateAirFire(const QByteArray &transparentData,
                        const QHash<int, CentralEffectSimulation::HandlerParticipant::CesParticipantData> &aircrafts);
  void calculateAreaFire(const QByteArray &transparentData,
@@ -45,7 +45,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesGeoPairingImpl
    ${CMAKE_CURRENT_SOURCE_DIR}/../
    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
  PRIVATE
    RTI::nddscpp2
@@ -59,4 +58,3 @@ NGL_TARGET_LINK_LIBRARIES(svcCesGeoPairingImpl
    FW_Ballistic
    NGLLogger
 )
-ENDIF(BUILD_RTI)
@@ -94,6 +94,8 @@ public:

 protected:
  int m_Size = 2;
+  NGL::INGLLogger &m_logger;
+
 };

 }
@@ -22,7 +22,7 @@
 #include "GeoPairingImplAirTargetCacheData.hpp"

 #include "GeoPairingDataFireReport.hpp"
-#include <QtCore/QDateTime>
+#include <QDateTime>

 #define PAN_AMMU_TIMEPROG(ammunition) (ammunition       & 0x01)
 #define PAN_AMMU_INDEX(ammunition)   ((ammunition >> 1) & 0x03)
@@ -99,6 +99,7 @@ protected:
  GeoPairingImplMeteoData m_MeteoData;

  CacheType m_CacheData;
+  NGL::INGLLogger &m_logger;
 };

 }
@@ -70,6 +70,8 @@ public:
 protected:

 private:
+  NGL::INGLLogger &m_logger;
+
 };

 }
@@ -85,6 +85,9 @@ private:
  CacheType *m_CacheData;
  SInt32 m_PlayerID;
  UInt32 m_Timeout;
+  NGL::INGLLogger &m_logger;
+
+
  /**
   *
   * @param a_targetID
@@ -86,6 +86,8 @@ protected:
  UInt64 m_Time = 0;

 private:
+  NGL::INGLLogger &m_logger;
+
 };

 }
@@ -61,6 +61,8 @@ protected:
 private:

  SInt32 m_UpdateCount = 0;
+  NGL::INGLLogger &m_logger;
+
 };

 }
@@ -22,7 +22,7 @@
 #include <GBL_ConfigSystem/geoconfig.h>
 #include <limits>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QPointF>
+#include <QPointF>

 #ifdef WIN32
 #define RAND48_SEED_0   (0x330e)
@@ -121,6 +121,9 @@ protected:
  GeoPairingImplMeteoData m_MeteoData;

  GeoPairingImplImpactData m_ImpactData;
+
+  NGL::INGLLogger &m_logger;
+
 };

 }
@@ -6,7 +6,7 @@
  */

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

 namespace NGL
 {
@@ -7,7 +7,6 @@
  */

 #include "handler_geopairing.h"
-#include <utility>
 #include "settings.h"
 #include "GBL_ConfigSystem/geoconfig.h"
 #include "GeoPairingImpl/GeoPairingImpl.hpp"
@@ -16,12 +15,12 @@
 #include "GeoPairingImpl/GeoPairingImplBalistic.hpp"

 #include <CentralEffectSimulation/handler_participant.h>
-#include <LtsUtils/LtsUtilsCore/dds_vector.h>
+#include <LtsUtilsCore/dds_vector.h>
 #include <TrainingAreaBase/tab_ftc.h>

-#include <QtCore/QSettings>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDataStream>
+#include <QSettings>
+#include <QFileInfo>
+#include <QDataStream>


 using namespace N_ConfigSystem;
@@ -39,6 +38,7 @@ HandlerGeoPairing::HandlerGeoPairing(const std::shared_ptr<CentralEffectSimulati
  , m_ballisticService(ballisticService)
  , m_requestMap()
  , m_timer(new QTimer(this))
+  , m_logger(getLogger("Plugin.GeoPairing.HandlerGeoPairing"))
 {

  m_timer->setSingleShot(true);
@@ -116,7 +116,7 @@ bool HandlerGeoPairing::init()
  {
    // Fehlerfall:
    const QFileInfo qFileInfo(fileName);
-    ERROR_LOG(m_logger) << Q_FUNC_INFO << " initFilename failed: '" << qFileInfo.absoluteFilePath() << "'";
+    ERROR_LOG(m_logger) << LOGFUNCTION << " initFilename failed: '" << qFileInfo.absoluteFilePath() << "'";
    return false;
  }

@@ -539,7 +539,7 @@ void HandlerGeoPairing::onSendGeopairingDataReply(const Core::FunctionReplyObjec
 void HandlerGeoPairing::sendFtcCesHitRequestTimeout()
 {
  auto ftcTab = m_ddsHandlerAes->ftcTab();
-  for (const TrainingAreaBase::SendCesHitRequest &hr : std::as_const(m_requestMap))
+  for (const TrainingAreaBase::SendCesHitRequest &hr : qAsConst(m_requestMap))
  {
    DEBUG_LOG(m_logger)  << "sendFtcCesHitRequest: " << hr;
    ftcTab->sendCesHitRequest(hr, this);
@@ -16,7 +16,7 @@
 #include <MeteoDataManagement/mdm_dtc.h>
 #include <CentralEffectSimulation/handler_participant.h>
 #include <FW_Ballistic/BallisticService.hpp>
-#include <QtCore/QTimer>
+#include <QTimer>

 #include <QtCore/QObject>

@@ -42,7 +42,6 @@ public:
    eElevationBelowZero = 3
  };
 private:
-NGL::INGLLogger &m_logger;
  struct GeoPCharge
  {

@@ -146,7 +145,7 @@ private: // attributes
  GeoPMunitonMap                                         m_geoPMunMap;
  GeoPairing                                            *m_geoPairingPtr;

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

 };
 } // namespace CesGeoPairing
@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-// #include "cesplugingeopairing_export.h"  // export macro not needed since it´s only WITHIN the lib/module
+// #include "ces_export.h"  // export macro not needed since it´s only WITHIN the lib/module

 namespace CesGeoPairing
 {
@@ -32,7 +32,7 @@ CesGeoPairingInterfaceImpl::CesGeoPairingInterfaceImpl(CentralEffectSimulation::
  , m_ddsHandler(m_mainHandler->dds())
  , m_db(m_mainHandler->db())
  , m_handlerParticipant(m_mainHandler->handlerParticipant())
-  .getNGLLogger("CES.Plugin.GeoPairingInterfaceImpl"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.GeoPairingInterfaceImpl"))
 {
  Q_UNUSED(settings)
 }
@@ -17,7 +17,7 @@
 #include <CentralEffectSimulation/dds_handler.h>
 #include <NGLLogger/INGLLogger.h>

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

 namespace CesGeoPairing
 {
@@ -63,7 +63,6 @@ private Q_SLOTS:
  bool init(int domainId, int exerciseId) override;
 private:

-NGL::INGLLogger &m_logger;
 private:
  CentralEffectSimulation::Plugin::DataProvider                              *m_pdp{nullptr};
  std::shared_ptr<DDSConnector::DdsConnector>                                 m_ddsConnector;
@@ -75,6 +74,9 @@ private:

  std::shared_ptr<HandlerGeoPairing>                 m_handlerGeoPairing;       ///< Pointer to handler for GeoPairing
  std::shared_ptr<N_Ballistic::BallisticService>     m_ballisticService;        ///< Pointer Ballistic Service
+
+
+  NGL::INGLLogger &m_logger;
  int m_domainId = 0;
  int m_exerciseId = 0;
 };
@@ -6,7 +6,7 @@
  */

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

 namespace NGL
 {