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

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

 #include "object_effector.h"
 #include "main_handler.h"
@@ -16,9 +15,9 @@
 #include <ParticipantManagement/ppm.hpp>
 #include "Trajectory/trajectory_transform.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <LtsUtilsCore/qpoint3d.h>

-#include <QtCore/QJsonDocument>
+#include <QJsonDocument>
 #include <QRandomGenerator>

 namespace AreaEffectSimulation
@@ -26,17 +25,19 @@ namespace AreaEffectSimulation



-AbstractFiringStrategy::AbstractFiringStrategy(ObjectEffector *parent) : QObject(parent)
-  , m_effector(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
+AbstractFiringStrategy::AbstractFiringStrategy(ObjectEffector *parent)
+  : QObject(parent)
+  , m_effector(parent)
+  , m_logger(getLogger("FiringStrategy"))
+{
+  TRACE_LOG(m_logger) << LOGFUNCTION << " START";
+  TRACE_LOG(m_logger) << LOGFUNCTION << " END";
 }

 AbstractFiringStrategy::~AbstractFiringStrategy()
 {
-  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";
 }

 void AbstractFiringStrategy::calculateDispersionTrajectory()
@@ -49,7 +50,7 @@ void AbstractFiringStrategy::calculateDispersionTrajectory()
  // sanity check:
  if (intendendTrajectory.size() < 2)
  {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << LOGFUNCTION
                        << " size of intendendTrajectory not sufficiant, size=" << intendendTrajectory.size();
    return;
  }
@@ -72,7 +73,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
  // sanity check:
  if (relativeTrajectory.size() < 2)
  {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << LOGFUNCTION
                        << " size of relativeTrajectory not sufficiant, size=" << relativeTrajectory.size();
    return {};
  }
@@ -86,7 +87,7 @@ std::vector<Core::GeoPositionRelativeTime> AbstractFiringStrategy::buildTrajecto
  geometry.reserve(relativeTrajectory.size());

  // Aehnlich wie Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp Zeile 365
-  for (const TrajectoryPoint &trajPntRelPos : std::as_const(relativeTrajectory))
+  for (const TrajectoryPoint &trajPntRelPos : qAsConst(relativeTrajectory))
  {
    DEBUG_LOG(m_logger) << "Flugbahnpunkt: trajPntRelPos :" << trajPntRelPos;    // benefit from operator<<:

@@ -114,7 +115,7 @@ TrajectoryTimeAware AbstractFiringStrategy::buildTrajectoryTimeAware(const std::
  // sanity check:
  if (trajectoryGeometry.size() < 2)
  {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << LOGFUNCTION
                        << " size of trajectoryGeometry not sufficiant, size=" << trajectoryGeometry.size();
    return {};
  }
@@ -139,7 +140,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto
  // sanity check:
  if (trajGeometry.size() < 2)
  {
-    ERROR_LOG(m_logger) << Q_FUNC_INFO
+    ERROR_LOG(m_logger) << LOGFUNCTION
                        << " size of trajectoryTimeAware.geometry not sufficiant, size=" << trajGeometry.size();
    return -1;
  }
@@ -186,7 +187,7 @@ int32_t AbstractFiringStrategy::gearTypeId(int chargeTypeId, int participantId)
  DEBUG_LOG(m_logger) << "gearSize " << dynamicParticipantData.gear().size();

  const auto& participantData_gear = dynamicParticipantData.gear();
-  for (const auto &gear : std::as_const(participantData_gear))
+  for (const auto &gear : qAsConst(participantData_gear))
  {
    DEBUG_LOG(m_logger) << "gear.chargeTypeId(): " << gear.chargeTypeId() << ", chargeTypeId:" << chargeTypeId;
    if (gear.chargeTypeId() == chargeTypeId)
@@ -21,9 +21,9 @@
 #pragma once

 #include <AreaEffectSimulation/logger.h>
-#include <QtCore/QObject>
+#include <QObject>
 #include <Core/core.hpp>
-#include <QtCore/QJsonObject>
+#include <QJsonObject>

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

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

 #include "main_handler.h"
 #include "object_effector.h"
@@ -16,10 +15,10 @@
 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 #include <Trajectory/trajectory_transform.h>

-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
 #include <QTransform>

 namespace AreaEffectSimulation
@@ -73,7 +72,7 @@ void Dm72FiringStrategy::init()
  QVector<UtmWithHeight> tempUtmTreffpunkte;
  tempUtmTreffpunkte.reserve(wirkmittel.geschoss.anzahl);

-  for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte))
+  for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte))
  {
    const UtmCoordinate utmTreffpunkt = UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * deg2rad(),
                                                                      treffpunkt.koordinate.koordinate.latitude * deg2rad(),
@@ -7,15 +7,14 @@
  */

 #include "gmlrs_firing_strategy.h"
-#include <utility>
 #include "object_effector.h"

 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 #include <Trajectory/trajectory_transform.h>
 #include <LtsCoordTrans/lts_coord_trans.h>

-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
+#include <QJsonDocument>
+#include <QJsonObject>

 namespace AreaEffectSimulation
 {
@@ -69,7 +68,7 @@ void GmlrsFiringStrategy::init()
  WirkmittelFeuerkommandoRakete wirkmittel;
  wirkmittelFeuerkommandoRaketeFromJson(properties, wirkmittel, bOk);

-  for (const Treffpunkt &treffpunkt : std::as_const(wirkmittel.treffpunkte))
+  for (const Treffpunkt &treffpunkt : qAsConst(wirkmittel.treffpunkte))
  {
    const LtsCoordTrans::UtmCoordinate utmTreffpunkt =
        LtsCoordTrans::UtmCoordinate::fromGeographic(treffpunkt.koordinate.koordinate.longitude * LtsCoordTrans::deg2rad(),
@@ -9,7 +9,7 @@
 #pragma once

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

 namespace Core
 {
@@ -13,8 +13,8 @@
 #include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
 #include <TrajectorySplitter/trajectory_splitter.h>

-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
+#include <QJsonDocument>
+#include <QJsonObject>

 namespace AreaEffectSimulation
 {