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
@@ -7,10 +7,9 @@
  */

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

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

 #include <LtsCoordTrans/lts_coord_trans.h>

@@ -127,7 +126,7 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff
                      << " participantTypeId=" << partPos.participantTypeId()
                      << " Anzahl Borderlines=" << m_borderlines.size();

-  for (const BorderlineUtm &borderline : std::as_const(m_borderlines))
+  for (const BorderlineUtm &borderline : qAsConst(m_borderlines))
  {
    DEBUG_LOG(m_logger) << "borderline id = " << borderline.id
                        << ", Box bottomLeft = " << CentralEffectSimulation::debug(borderline.boundingBox.bottomLeft())
@@ -15,8 +15,8 @@
 #include <CentralEffectSimulation/handler_participant.h>


-#include <QtCore/QHash>
-#include <QtCore/QRectF>
+#include <QHash>
+#include <QRectF>
 #include <QPolygonF>


@@ -6,10 +6,9 @@
  * Created by gr, SLSE, 2017-02-20
  */
 #include "handler_simulated_movement.h"
-#include <utility>
 #include <CentralEffectSimulation/handler_participant.h>

-#include <QtCore/QTimer>
+#include <QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ngldb/dbtransaction.h>

@@ -66,7 +65,7 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
  DEBUG_LOG(m_logger) << "loadSimulatedMovementSegmentsFromDb size =" << simMoveSegVec.size();

  // add to internal buffer
-  for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : std::as_const(simMoveVec))
+  for (const CentralEffectSimulation::Database::CesSimulatedMovement &data : qAsConst(simMoveVec))
  {
    CentralEffectSimulation::SimulatedMovement request;
    request.id(data.id);
@@ -78,14 +77,14 @@ bool HandlerSimulatedMovement::loadSimulatedMovementFromDb()
    DEBUG_LOG(m_logger) << "Loading SimulatedMovement: " << request;

    QMap <int, CentralEffectSimulation::Database::CesSimulatedMovementSegment> segDbMap; // QMap to get it sorted
-    for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segData : std::as_const(simMoveSegVec))
+    for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segData : qAsConst(simMoveSegVec))
    {
      if (segData.simulatedMovementId == data.id)
        segDbMap.insert(segData.positionIndex, segData);
    }
    request.segments().reserve(segDbMap.size());
    CentralEffectSimulation::SimulatedMovementSegment seg;
-    for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segDb : std::as_const(segDbMap))
+    for (const CentralEffectSimulation::Database::CesSimulatedMovementSegment &segDb : qAsConst(segDbMap))
    {
      seg.delay(segDb.delay);
      seg.name(segDb.name.toStdString());
@@ -281,7 +280,7 @@ void HandlerSimulatedMovement::onSimulatedMovementRemoveByParticipantIdRequest(c
  DEBUG_LOG(m_logger) << "onSimulatedMovementRemoveByParticipantIdRequest: " << request;

  int id = 0;
-  for (const SimulationMovement *simMovement : std::as_const(m_simulationMovements))
+  for (const SimulationMovement *simMovement : qAsConst(m_simulationMovements))
  {
    if (simMovement->participantId() == request.participantId())
    {
@@ -300,7 +299,7 @@ SimulationMovement *HandlerSimulatedMovement::findSimulationMovement(int id, int
 {
  if (id)
    return m_simulationMovements.value(id);
-  for (SimulationMovement *s : std::as_const(m_simulationMovements))
+  for (SimulationMovement *s : qAsConst(m_simulationMovements))
  {
    if (s->participantId() == participantId)
      return s;
@@ -18,7 +18,7 @@
 #include <ParticipantManagement/ppm_ftc.h>
 #include <CentralEffectSimulation/handler_participant.h>

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



@@ -16,7 +16,7 @@
 #include <CentralEffectSimulation/main_handler.h>
 #include <CentralEffectSimulation/dds_handler.h>

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


 //namespace NGLDB
@@ -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;
@@ -74,6 +73,10 @@ private:
  std::shared_ptr<CentralEffectSimulation::HandlerParticipant>                m_handlerParticipant;      ///< Pointer to handler for all participants
  std::shared_ptr<HandlerParticipantBorderline>                               m_handlerParticipantBorderline;  ///< Pointer to handler for check participants cross Borderline
  std::shared_ptr<HandlerSimulatedMovement>                                   m_handlerSimulatedMovement; ///< Pointer to handler for Simulated Movement
+
+
+
+  NGL::INGLLogger &m_logger;
  int m_domainId = 0;
  int m_exerciseId = 0;
 };
@@ -8,7 +8,7 @@

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

 namespace CentralEffectSimulationBasic
 {
@@ -12,9 +12,9 @@
 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/ces_db.h>

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


 namespace CentralEffectSimulationBasic