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 @@ NGL_ADD_LIBRARY2(WS SV HLA Trajectory SHARED
 )
 NGL_TARGET_INCLUDE_DIRECTORIES(Trajectory
  INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../
    ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
 NGL_TARGET_LINK_LIBRARIES(Trajectory
@@ -15,22 +15,12 @@ SET(UnitTestSources
 )

 IF(BUILD_TESTING)
-   NGL_ADD_EXECUTABLE(SV aesUnitTestTrajectory ${LinkedSources} ${UnitTestSources} )
-
-   NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestTrajectory
-     PRIVATE
-       ${CMAKE_CURRENT_SOURCE_DIR}/../../
-       ${CMAKE_SOURCE_DIR}/Lts/Services/AreaEffectSimulation
-       ${CMAKE_SOURCE_DIR}/Lts/
-       ${CMAKE_SOURCE_DIR}/Lts/Services/
-       ${CMAKE_BINARY_DIR}/Lts/
-   )
+   ADD_EXECUTABLE(aesUnitTestTrajectory ${LinkedSources} ${UnitTestSources} )

   TARGET_LINK_LIBRARIES(aesUnitTestTrajectory
     NGLLogger
     nglcoreapplication
     svcAesCommon
-     Trajectory
     Qt6::Core
     Qt6::Gui
     Qt6::Test)
@@ -7,7 +7,6 @@
  */

 #include "trajectory_unit_test.h"
-#include <utility>
 #include <Trajectory/trajectory_helper.h>
 #include <Trajectory/trajectory_generator.h>
 #include <Trajectory/trajectory_generator_vulcano.h>
@@ -16,7 +15,7 @@
 #include <nglapplication/nglcoreapplication.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QtTest/QTest>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <LtsUtilsCore/qpoint3d.h>
 #include <LtsCoordTrans/lts_coord_trans.h>

 #include <iostream>
@@ -992,7 +991,7 @@ void UnitTestTrajectory::test_vulcano_trajectory()
  }

  int i=0;
-  for (auto &item : std::as_const(trajectoryOut))
+  for (auto &item : qAsConst(trajectoryOut))
    INFO_LOG(m_logger) << "i = " << i++ << ", item " << item;
 }

@@ -8,7 +8,7 @@

 #pragma once

-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #include <QtTest/QTest>
 #include <NGLLogger/INGLLogger.h>

@@ -78,5 +78,6 @@ private Q_SLOTS:

 private:

-NGL::INGLLogger &m_logger;
+  LOGGER_T m_logger;
+
 };
@@ -8,14 +8,13 @@
  */

 #include "trajectory_generator.h"
-#include <utility>
 #include "trajectory_generator_vulcano.h"
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>


 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <LtsUtilsCore/qpoint3d.h>

 #ifdef NEVER // for csv file
 #  include <QFile>
@@ -61,7 +60,7 @@ TrajectoryGenerator *TrajectoryGenerator::getInstance(int exerciseId,
    if (ltsElevationManager)
    {
      ltsElevationManager->waitForInitialization();
-      DEBUG_LOG(logger) << Q_FUNC_INFO << ", ltsElevationManager->waitForInitialization() ... DONE, isValid = " << ltsElevationManager->isValid();
+      DEBUG_LOG(logger) << LOGFUNCTION << ", ltsElevationManager->waitForInitialization() ... DONE, isValid = " << ltsElevationManager->isValid();
    }
    s_trajectoryGenerator->initElevation(ltsElevationManager);
  }
@@ -85,22 +84,22 @@ void TrajectoryGenerator::cleanup()

 void TrajectoryGenerator::initElevation(LtsElevation::LtsElevationManager *ltsElevationManager)
 {
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
  m_ltsElevationManager = ltsElevationManager;
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }

 LtsElevation::LtsElevationManager *TrajectoryGenerator::getElevationManager()
 {
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
  return m_ltsElevationManager;
 }

 bool TrajectoryGenerator::hasElevationManager() const
 {
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
  return m_ltsElevationManager;
 }

@@ -200,7 +199,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo
      {
        QPoint4D startPoint = trajectoryMetricOut.first();

-        for (const QPoint4D &p4D : std::as_const(trajectoryMetricOut))
+        for (const QPoint4D &p4D : qAsConst(trajectoryMetricOut))
        {
          output << p4D.x() - startPoint.x()  << ";"
                 << p4D.y() - startPoint.y() << ";"
@@ -232,7 +231,7 @@ bool TrajectoryGenerator::generateTrajectoryVulcano(const QPoint3D &originatorPo
  trajectoryTimeAwareOut.clear();
  trajectoryTimeAwareOut.reserve(trajectoryMetricOut.size());

-  for (const QPoint4D& pnt4d : std::as_const(trajectoryMetricOut))
+  for (const QPoint4D& pnt4d : qAsConst(trajectoryMetricOut))
  {
    LtsCoordTrans::UtmCoordinate pntUtm(idealHitUtm.zone, pnt4d.x(), pnt4d.y());
    const QPointF &pntGeo = pntUtm.geographic();
@@ -13,11 +13,11 @@
 #include "trajectory_generator_vulcano.h"
 #include <Core/core.hpp> // Lts/DDS/Core/core.hpp for Core::GeoPosition
 #include <LtsElevation/lts_elevation_manager.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include "trajectory_export.h"
+#include <LtsUtilsCore/qpoint3d.h>
+#include <Trajectory/trajectory_export.h>

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

 #include <vector>
@@ -89,7 +89,6 @@ class TRAJECTORY_EXPORT TrajectoryGenerator : public QObject
                                        QString *reasonOut);

  protected:
-  NGL::INGLLogger &m_logger;
  /*! \name Ideal trajectory */
  template <typename CONT_T>
  bool generateTrajectoryBiedziak(const LtsUtils::QPoint3D &originatorPosition_geo,
@@ -98,7 +97,6 @@ class TRAJECTORY_EXPORT TrajectoryGenerator : public QObject
                                  CONT_T &trajectoryOut);

  protected:
-  NGL::INGLLogger &m_logger;
  explicit TrajectoryGenerator();

  public:
@@ -111,6 +109,7 @@ class TRAJECTORY_EXPORT TrajectoryGenerator : public QObject
  static const QString string4poly(const QPair<QPolygonF, QVector<double>> &pair);

  LtsElevation::LtsElevationManager *m_ltsElevationManager{nullptr};
+  LOGGER_T m_logger;
 };

 } // namespace AreaEffectSimulation
@@ -8,10 +8,9 @@
  */

 #include "trajectory_generator_vulcano.h"
-#include <utility>

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

 namespace AreaEffectSimulation
 {
@@ -172,7 +171,7 @@ bool TrajectoryGeneratorVulcano::trajectoryVulcano(const QPoint3D &origin, const
  trajectoryOut.reserve(phase1_bal.size()+5);

  int cnt = 0;
-  for (const QPointF &xyVertex : std::as_const(phase1_bal))
+  for (const QPointF &xyVertex : qAsConst(phase1_bal))
  {
    // translate from XY to XYZ
    const QPoint3D p3d_offset(xyVertex.x() * factorX,       // xyVertex.x()
@@ -11,11 +11,11 @@
 #pragma once

 #include "../logger.h"
-#include "trajectory_export.h"
+#include <Trajectory/trajectory_export.h>

 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QtCore/QVector>
+#include <LtsUtilsCore/qpoint3d.h>
+#include <QVector>
 #include <QVector2D>

 #include <cmath>
@@ -10,11 +10,11 @@
 #include "trajectory_helper.h"
 #include "../logger.h"

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

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

 #include <iostream>
 #include <cmath>
@@ -10,8 +10,8 @@

 #pragma once

-#include "trajectory_export.h"
-#include "trajectory_export.h"
+#include <AreaEffectSimulation/aes_export.h>
+#include <Trajectory/trajectory_export.h>

 // Forward
 namespace LtsUtils {
@@ -7,9 +7,9 @@

 #pragma once

-#include <QtCore/QVector>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include "trajectory_export.h"
+#include <QVector>
+#include <LtsUtilsCore/qpoint3d.h>
+#include <Trajectory/trajectory_export.h>

 namespace AreaEffectSimulation
 {
@@ -1,10 +1,10 @@
 #pragma once

 #include "trajectory_point.h"
-#include "trajectory_export.h"
+#include <Trajectory/trajectory_export.h>

-#include <QtCore/QVector>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <QVector>
+#include <LtsUtilsCore/qpoint3d.h>

 namespace AreaEffectSimulation
 {