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/AreaEffectSimulation/Utils/aes_helper.cpp

@@ -8,8 +8,8 @@
 
 #include "aes_helper.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QSet>
+#include <QHash>
+#include <QSet>
 
 
 namespace AreaEffectSimulation

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/aes_helper.h

@@ -8,16 +8,16 @@
 
 #pragma once
 
-#include "svcaescommon_export.h"
+#include <AreaEffectSimulation/aes_export.h>
 #include <math.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QPointF>
-#include <QtCore/QString>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonArray>
-#include <LtsUtils/dds_bitarray.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <QPointF>
+#include <QString>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <LtsUtilsCore/dds_bitarray.h>
+#include <LtsUtilsCore/qpoint3d.h>
 #include "aes_db.h"
 
 namespace AreaEffectSimulation

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.cpp

@@ -6,9 +6,9 @@
 */
 
 #include <QtGlobal>
-#include <QtCore/QTimer>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QTimer>
+#include <QStringList>
+#include <QVector>
 
 #include <AreaEffectSimulation/logger.h>
 #include <AreaEffectSimulation/settings.h>
@@ -26,6 +26,7 @@ FireAutomaton::FireAutomaton(QObject *parent)
   , m_intervalMSecs(0)
   , m_remainingTickMSecs(0)
   , m_state(State::Uninitialized)
+  , m_logger(getLogger("Utils.FireAutomaton"))
 {
   m_timer.setSingleShot(true);
   connect(&m_timer, &QTimer::timeout, this, &FireAutomaton::nextTick, Qt::UniqueConnection);

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/fire_automaton.h

@@ -6,10 +6,10 @@
     */
 
 #include <QtCore>
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QTimer>
+#include <QString>
+#include <QVector>
 
 #include "../logger.h"
 
@@ -72,7 +72,6 @@ private slots:
   void nextTick();
 
 private:
-  NGL::INGLLogger &m_logger;
   enum class PatternElement {
     All,
     AllFill,
@@ -90,7 +89,6 @@ private:
   QVector<int32_t> getEffectorIds(int32_t tick) const;
 
 private:
-  NGL::INGLLogger &m_logger;
   QVector<int32_t> m_effectorIds;
   QVector<FireAutomaton::PatternElement> m_pattern;
   QVector<QVector<int32_t>> m_schedule;
@@ -101,6 +99,8 @@ private:
   int32_t m_intervalMSecs;
   int32_t m_remainingTickMSecs;
   State m_state;
+
+  LOGGER_T m_logger;
 };
 
 } // namespace AreaEffectSimulation

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.cpp

@@ -10,13 +10,13 @@
 #include "firing_timer.h"
 #include "../logger.h"
 
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
+#include <LtsUtilsCore/qpoint3d.h>
 
-#include <QtCore/QString>
-#include <QtCore/QTimer>
+#include <QString>
+#include <QTimer>
 #include <QElapsedTimer>
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QDebug>
 
 #include <iostream>
 #include <cmath>
@@ -27,7 +27,7 @@ namespace AreaEffectSimulation
 
 
 // To be able to aesily differentiate between different instances:
-#define MY_Q_FUNC_INFO "debugInfo='" << d->m_debugInfo << "' " << Q_FUNC_INFO
+#define MY_LOGFUNCTION "debugInfo='" << d->m_debugInfo << "' " << Q_FUNC_INFO
 
 
 static long s_counter{0};
@@ -129,21 +129,22 @@ public:
 FiringTimer::FiringTimer(const QString &debugInfo)
   : BaseClass(nullptr)
   , d(new Private)
+  , m_logger(getLogger("Utils.FiringTimer"))
 {
   ++s_counter;
   d->m_debugInfo = debugInfo;
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 FiringTimer::~FiringTimer()
 {
   --s_counter;
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
   QString debugInfoSave = d->m_debugInfo;
   delete d;
-  //DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
-  DEBUG_LOG(m_logger) << "debugInfo='" << debugInfoSave << "'"  << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
+  //DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
+  DEBUG_LOG(m_logger) << "debugInfo='" << debugInfoSave << "'"  << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
 }
 
 void FiringTimer::setDebugInfo(const QString &debugInfo)
@@ -153,14 +154,14 @@ void FiringTimer::setDebugInfo(const QString &debugInfo)
 
 void FiringTimer::reset()
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
   d->reset();
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
 }
 
 bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDurationMsec)
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START,"
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START,"
                       << ", effectDurationMsec=" << effectDurationMsec
                       << ", ammoCount=" << ammoCount
                       << ", ammoFlightDurationMsec=" << ammoFlightDurationMsec;
@@ -170,7 +171,7 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
   d->m_ammoCount              = ammoCount;
   d->m_ammoFlightDurationMsec = ammoFlightDurationMsec;
   d->m_intervallMsec          = static_cast<double>(d->m_effectDurationMsec) / d->m_ammoCount; // ensure float calculation
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " m_intervallMsec " << d->m_intervallMsec;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " m_intervallMsec " << d->m_intervallMsec;
 
   d->m_firingTimer->stop();
   d->m_firingTimer->setSingleShot(false);
@@ -178,24 +179,24 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
   connect(d->m_firingTimer, &QTimer::timeout,
           this, &FiringTimer::onFiringTimout, Qt::UniqueConnection);
 
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
   return true;
 }
 
 bool FiringTimer::startFiring()
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
 
   if ((d->m_currentFiringMode != FiringMode::FM_Undefined) &&
       (d->m_currentFiringMode != FiringMode::FM_Paused))
   {
-    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
+    ERROR_LOG(m_logger) << MY_LOGFUNCTION << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
     return false;
   }
 
   if (remainingAmmoCount() <= 0)
   {
-    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
+    ERROR_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left"
                         << " (total ammoCount was: " << d->m_ammoCount
                         << " cur firingMode = " << (int)d->m_currentFiringMode;
     return false;
@@ -213,7 +214,7 @@ bool FiringTimer::startFiring()
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
 
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
 
   d->m_firingTimer->start();
   d->m_currentFiringMode = FiringMode::FM_Active;
@@ -227,7 +228,7 @@ bool FiringTimer::startFiring()
     d->m_pausedMsec += pausedElapsedMsec;
     d->m_etPaused->invalidate();
   }
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing after [ms]: " << pausedElapsedMsec
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " start firing after [ms]: " << pausedElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
@@ -256,7 +257,7 @@ bool FiringTimer::startFiring()
   // to fire at the beginning of the interval:
   onFiringTimout();
 
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
   return true;
 }
 
@@ -270,17 +271,17 @@ bool FiringTimer::startFiringDelay(qint64 delayMsec)
 
 bool FiringTimer::pauseFiring()
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
 
   if (d->m_currentFiringMode != FiringMode::FM_Active)
   {
-    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode";
+    ERROR_LOG(m_logger) << MY_LOGFUNCTION << " wrong firingMode";
     return false;
   }
 
   if (remainingAmmoCount() <= 0)
   {
-    ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
+    ERROR_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left"
                         << " (total ammoCount was: " << d->m_ammoCount;
     return false;
   }
@@ -293,7 +294,7 @@ bool FiringTimer::pauseFiring()
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
 
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
   d->m_firingTimer->stop();
   d->m_currentFiringMode = FiringMode::FM_Paused;
   d->m_etPaused->start();
@@ -305,14 +306,14 @@ bool FiringTimer::pauseFiring()
   const qint64 activeElapsedMsec = d->m_etActive->elapsed();
   d->m_activeMsec += activeElapsedMsec;
   d->m_etActive->invalidate();
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing after [ms]: " << activeElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
   QString log = QString(QStringLiteral("pauseFiring_at_%1")).arg(QDateTime::currentMSecsSinceEpoch()) ;
   d->m_logHistorie.append(log);
 
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
   return true;
 }
 
@@ -346,7 +347,7 @@ long FiringTimer::intervallMsec() const
 #ifdef SUPPORT_STATE_CHANGE_DELAYED
 void FiringTimer::emitStateChangeDelayed(AreaEffectSimulation::FiringTimer::CMD cmd, int firedAmmoCount)
 {
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
                        << ", firedAmmoCount = " << firedAmmoCount;
   emit stateChangeDelayedAsInt(static_cast<int>(cmd), firedAmmoCount);
 }
@@ -380,11 +381,11 @@ QString FiringTimer::toString(const CMD cmd)
 
 void FiringTimer::onFiringTimout()
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
 
   ++d->m_firedAmmoCount;
 
-  INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit firing with: " << d->m_firedAmmoCount
+  INFO_LOG(m_logger) << MY_LOGFUNCTION << " emit firing with: " << d->m_firedAmmoCount
                      << " of total ammoCount = " << d->m_ammoCount;
   emit firing(d->m_firedAmmoCount, d->m_ammoCount);
 
@@ -396,7 +397,7 @@ void FiringTimer::onFiringTimout()
     int currentFiringNumber = d->m_firedAmmoCount;
     int totalFiringNumber   = d->m_ammoCount;
 
-    DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
+    DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
 
     QTimer::singleShot(d->m_ammoFlightDurationMsec, this, [this, currentFiringNumber, totalFiringNumber]()
     {
@@ -408,7 +409,7 @@ void FiringTimer::onFiringTimout()
       }
 #endif // SUPPORT_STATE_CHANGE_DELAYED
 
-      INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit impact " << currentFiringNumber
+      INFO_LOG(m_logger) << MY_LOGFUNCTION << " emit impact " << currentFiringNumber
                          << " of total = " << totalFiringNumber;
       emit impact(currentFiringNumber, totalFiringNumber);
 
@@ -430,7 +431,7 @@ void FiringTimer::onFiringTimout()
 
   if (d->m_firedAmmoCount >= d->m_ammoCount)
   {
-    INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left, finishing firing"
+    INFO_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left, finishing firing"
                        << ", " << d->m_firedAmmoCount << " of total ammoCount = " << d->m_ammoCount << " are fired";
     d->m_firingTimer->stop();
 
@@ -440,7 +441,7 @@ void FiringTimer::onFiringTimout()
 
     // !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
 
-    DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
+    DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing after [ms]: " << activeElapsedMsec
                         << ", m_activeMsec in total = " << d->m_activeMsec
                         << ", m_pausedMsec in total = " << d->m_pausedMsec
                         << " now FiringTimoutExpiredPlus ...";
@@ -465,12 +466,12 @@ void FiringTimer::onFiringTimout()
     d->m_firingTimer->start();
   }
 
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
 }
 
 void FiringTimer::onFiringTimoutExpiredPlus()
 {
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
 
   d->m_currentFiringMode = FiringMode::FM_ExpiredPlus;
 
@@ -480,7 +481,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
 
   // !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
 
-  DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing2 after [ms]: " << activeElapsedMsec
+  DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing2 after [ms]: " << activeElapsedMsec
                       << ", m_activeMsec in total = " << d->m_activeMsec
                       << ", m_pausedMsec in total = " << d->m_pausedMsec;
 
@@ -488,7 +489,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
 
   emit firingFinishedPlus();
 
-  TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
+  TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
 }
 
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/firing_timer.h

@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include "svcaescommon_export.h"
+#include "aes_export.h"
 #include "../logger.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 
 #include <iosfwd>
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/icons.cpp

@@ -6,15 +6,14 @@
   */
 
 #include "icons.h"
-#include <utility>
 #include "polygons.h"
 
 #include <AreaEffectSimulation/aes.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QIcon>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
+#include <QGuiApplication>
+#include <QIcon>
+#include <QPainter>
+#include <QPixmap>
 #include <QTransform>
 
 namespace AreaEffectSimulation
@@ -55,7 +54,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
   for (const PolygonData &data : datas)
   {
     polyUtm.clear();
-    for (const QPointF &point : std::as_const(data.poly))
+    for (const QPointF &point : qAsConst(data.poly))
     {
       LtsCoordTrans::UtmCoordinate pointUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(point, zone);
       polyUtm << QPointF(pointUtm.x, pointUtm.y);
@@ -67,7 +66,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
   bounding.reserve(4 * datas.size());
   // Does not matter, how the total polygon looks as we just need the bounding rect.
   // << is cheaper than .united()
-  for (const QPolygonF &polyUtmLocal : std::as_const(polysUtm))
+  for (const QPolygonF &polyUtmLocal : qAsConst(polysUtm))
     bounding << polyUtmLocal;
 
   // center to center / Todo:: Does it always work?
@@ -90,7 +89,7 @@ static QPixmap pixmapFromPolygons(const QVector<PolygonData> &datas,
 
   QPainter p(&pix);
   int i = 0;
-  for (const PolygonData &d : std::as_const(datas))
+  for (const PolygonData &d : qAsConst(datas))
   {
     QPolygonF mPoly = mTrans.map(polysUtm.at(i++));
     mPoly = mScale.map(mPoly);

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "polygons.h"
-#include <utility>
 #include "tne_algorithmen.h"
 
 #include <aes.hpp>
@@ -15,8 +14,8 @@
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <LtsCoordinate/lts_coord_vector.h>
 #include <LtsCoordinate/lts_coordinate.h>
-#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <ParticipantManagement/ppm.hpp>
+#include <LtsUtilsCore/qpoint3d.h>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_db_structs.h>
 #include <Trajectory/trajectory_helper.h>
 
@@ -113,7 +112,7 @@ static QPolygonF utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::U
 {
   QPolygonF poly;
   poly.reserve(polyUtm.size());
-  for (const QPointF &point : std::as_const(polyUtm))
+  for (const QPointF &point : qAsConst(polyUtm))
     poly << base.geographic(point);
   return poly;
 }
@@ -477,7 +476,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS(const Database::AesEffectClu
 
   vec.reserve(impactCount);
   const QTransform trans(fromRotation(-effectCluster.rotationAngle)); // Compass, not mathematical!
-  for (const QPointF &point : std::as_const(impactsGAUSS))
+  for (const QPointF &point : qAsConst(impactsGAUSS))
   {
     QPointF p = impactPositionUtm.geographic(trans.map(point));
     DEBUG_LOG(logger) << "Point = " << p;
@@ -553,7 +552,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
 
   QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
   mtps_asRealUtm.reserve(mtps_asUtm.size());
-  for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
+  for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
   {
     // convert QPointF back to UtmCoordinate: pay attention to order!!!
     const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
@@ -592,7 +591,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
 
   int idx = 0;
   const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
-  for (const QPointF &point : std::as_const(impactsGAUSS))
+  for (const QPointF &point : qAsConst(impactsGAUSS))
   {
     // which mtp:
     int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
@@ -607,7 +606,7 @@ QVector<QPointF> effectClusterSingleExplosionsGAUSS_Mtp(const Database::AesEffec
               << ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
               << " rot=" << explosionCluster.rotationAngle;
 
-  for (auto item : std::as_const(finalVec))
+  for (auto item : qAsConst(finalVec))
   {
     const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
     qCritical() << " TNE VERIFICATION: CHECK:"
@@ -901,7 +900,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS(const Database::AesExplos
 
   vec.reserve(impactCount);
   const QTransform trans(fromRotation(-explosionCluster.rotationAngle)); // Compass, not mathematical!
-  for (const QPointF &point : std::as_const(impactsGAUSS))
+  for (const QPointF &point : qAsConst(impactsGAUSS))
   {
     QPointF p = impactPositionUtm.geographic(trans.map(point));
     DEBUG_LOG(logger) << "Point = " << p;
@@ -978,7 +977,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
 
   QVector<LtsCoordTrans::UtmCoordinate> mtps_asRealUtm;
   mtps_asRealUtm.reserve(mtps_asUtm.size());
-  for (const QPointF &mtp_asUtm : std::as_const(mtps_asUtm))
+  for (const QPointF &mtp_asUtm : qAsConst(mtps_asUtm))
   {
     // convert QPointF back to UtmCoordinate: pay attention to order!!!
     const LtsCoordTrans::UtmCoordinate mtpUtm(impactPositionUtm.zone, mtp_asUtm.x(), mtp_asUtm.y());
@@ -1017,7 +1016,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
 
   int idx = 0;
   const QTransform transform(fromRotation(-mtpRotationNorthDegree)); // Compass, not mathematical!
-  for (const QPointF &point : std::as_const(impactsGAUSS))
+  for (const QPointF &point : qAsConst(impactsGAUSS))
   {
     // which mtp:
     int mtpIdx = (idx++ % mtps_asUtm.size()); // modulo
@@ -1032,7 +1031,7 @@ QVector<QPointF> explosionClusterSingleExplosionsGAUSS_Mtp(const Database::AesEx
               << ", randomNumber=" << randomNumber << " singleWidthOut=" << singleWidthOut << " singleHeightOut=" << singleHeightOut
               << " rot=" << explosionCluster.rotationAngle;
 
-  for (auto item : std::as_const(finalVec))
+  for (auto item : qAsConst(finalVec))
   {
     const LtsCoordTrans::UtmCoordinate &utm = LtsCoordTrans::UtmCoordinate::fromGeographic(item);
     qCritical() << " TNE VERIFICATION: CHECK:"
@@ -1649,7 +1648,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
                                                          std::vector<Core::GeoPosition> &singlePositionsOut,
                                                          NGL::INGLLogger &logger)
 {
-  TRACE_LOG(logger) << Q_FUNC_INFO << " START, participantId=" << unitParticipantId;
+  TRACE_LOG(logger) << LOGFUNCTION << " START, participantId=" << unitParticipantId;
 
   static const LtsUtils::QPoint3D s_invalidPos(std::nan(""), std::nan(""), std::nan(""));
 
@@ -1657,7 +1656,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
   // See also GUEZE-2309
   if (!ppmDtc)
   {
-    ERROR_LOG(logger) << Q_FUNC_INFO << " ERROR, no ppmDtc";
+    ERROR_LOG(logger) << LOGFUNCTION << " ERROR, no ppmDtc";
     return s_invalidPos;
   }
   ppmDtc->waitForHistoricalDataParticipant(1000);
@@ -1665,7 +1664,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
   const ParticipantManagement::Participant &partData = ppmDtc->participant(unitParticipantId);
   if (partData.id() != unitParticipantId)
   {
-    ERROR_LOG(logger) << Q_FUNC_INFO << " ERROR, participant failed for id =" << unitParticipantId;
+    ERROR_LOG(logger) << LOGFUNCTION << " ERROR, participant failed for id =" << unitParticipantId;
     return s_invalidPos;
   }
   ppmDtc->waitForHistoricalDataParticipantPosition(1000);
@@ -1679,13 +1678,13 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
   int childCount = 0;
   LtsUtils::QPoint3D pos;
 
-  for (int childId : std::as_const(childIds))
+  for (int childId : qAsConst(childIds))
   {
     const ParticipantManagement::ParticipantPosition &childPos = ppmDtc->participantPosition(childId);
     if (childPos.participantId() != childId)
     {
       // may happen in real life: so ERROR_LOG to DEBUG_LOG
-      DEBUG_LOG(logger) << Q_FUNC_INFO << " ERROR, participantPosition failed for id =" << childId;
+      DEBUG_LOG(logger) << LOGFUNCTION << " ERROR, participantPosition failed for id =" << childId;
       return s_invalidPos;
     }
     const Core::GeoPosition &childGeoPos = childPos.pos();
@@ -1710,7 +1709,7 @@ LtsUtils::QPoint3D calculateFiringUnitCenterNonRecursive(const std::shared_ptr<P
   }
   DEBUG_LOG(logger) << "Participant " << unitParticipantId << ": Mean position: " << centerPosToReturn << " #relevant children: " << childCount;
 
-  TRACE_LOG(logger) << Q_FUNC_INFO << " END, participantId=" << unitParticipantId;
+  TRACE_LOG(logger) << LOGFUNCTION << " END, participantId=" << unitParticipantId;
   return centerPosToReturn;
 }
 
@@ -1732,7 +1731,7 @@ std::vector<Core::GeoPosition2D> dangerAreaDefaultSegments(const QPointF &center
   // polyUtm = QTransform().rotate(0).map(polyUtm);
   LtsCoordTrans::UtmCoordinate impactPositionUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(centerPos);
   const QPolygonF poly(utmToGeogrphic(polyUtm, impactPositionUtm));
-  for (const auto &p : std::as_const(poly))
+  for (const auto &p : qAsConst(poly))
     segments.push_back(Core::GeoPosition2D(p.x(), p.y()));
 
   return segments;

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/polygons.h

@@ -10,9 +10,9 @@
 #include <AreaEffectSimulation/aes_db_structs.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 
-#include <QtGui/QColor>
+#include <QColor>
 #include <QPolygonF>
-#include <QtCore/QRectF>
+#include <QRectF>
 
 class QPointF;
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/test_main.cpp

@@ -12,9 +12,9 @@
 #include "icons.h"
 #include "polygons.h"
 
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QLabel>
-#include <QtGui/QIcon>
+#include <QWidget>
+#include <QLabel>
+#include <QIcon>
 
 #include <LtsCoordTrans/lts_coord_trans.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Utils/tne_algorithmen.h

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "svcaescommon_export.h"
+#include <AreaEffectSimulation/aes_export.h>
 
-#include <QtCore/QVector>
-#include <QtCore/QPointF>
+#include <QVector>
+#include <QPointF>
 
 
 namespace AreaEffectSimulation