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

 #include "handler_aes_data.h"
-#include <utility>
 #include "settings.h"

 #include <CentralEffectSimulation/handler_participant.h>
 #include <CentralEffectSimulation/handler_building_data.h>

 #include <QPainterPath>
-#include <QtCore/QPointF>
+#include <QPointF>
 #include <QPolygonF>
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QTransform>

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


@@ -34,6 +33,7 @@ HandlerAesData::HandlerAesData(const std::shared_ptr<CentralEffectSimulation::Dd
  : QObject(parent)
  , m_ddsHandler(ddsHandler)
  , m_handlerBuildingData(buildingDataHandler)
+  , m_logger(getLogger("HandlerAesData"))
 {
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -181,7 +181,7 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos

    // Bounding-Box-Check
    // QMap<int, Footprint> m_footprints;
-    for (const Footprint &footprint : std::as_const(m_footprints))
+    for (const Footprint &footprint : qAsConst(m_footprints))
    {
      const QPointF impactPos(CentralEffectSimulation::geographic2Utm(data.impactPosition(), footprint.zone));
      const QPolygonF polyBldgRadius({QPointF(footprint.boundingBoxPolyUtm.bottomLeft().rx() - impactRadius,
@@ -304,7 +304,7 @@ void HandlerAesData::calculateFootprint(const InfrastructureManagement::MainFoot
  footprint.geoPosition = mse.geoPosition();
  const QPointF utmFpPosition = CentralEffectSimulation::geographic2Utm(footprint.geoPosition, &footprint.zone);
  footprint.polyUtm.reserve(poly.size());
-  for (const QPointF &point : std::as_const(poly))
+  for (const QPointF &point : qAsConst(poly))
    footprint.polyUtm.push_back(utmFpPosition + point);
  footprint.boundingBoxPolyUtm = footprint.polyUtm.boundingRect();

@@ -351,7 +351,7 @@ void HandlerAesData::preCalculateImpacts(const AreaEffectSimulation::TriggeredIm
  }
  // Bounding-Box-Check
  // QMap<int, Footprint> m_footprints;
-  for (const Footprint &footprint : std::as_const(m_footprints))
+  for (const Footprint &footprint : qAsConst(m_footprints))
  {
    //if (boundingBoxImpact.contains(footprint.boundingBoxPolyUtm))
    calculateImpacts(data, footprint);
@@ -407,7 +407,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac

  BitfieldStates &bitfieldStates = m_bitfieldStatesBld[footprint.mseId];
  QSet<int> &bitfieldState = bitfieldStates[data.aesItemId()];
-  for (int i : std::as_const(bitfieldState))
+  for (int i : qAsConst(bitfieldState))
    DEBUG_LOG(m_logger) << "bitfieldState for " << data.aesItemId() << ": " << i;

  const AreaEffectSimulation::AesItemView &aesItemView = *it;
@@ -422,7 +422,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac
      continue;

    const Core::GeoPosition2D &impactPosition = aesItemView.form()[bitFieldIdx];
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO
+    DEBUG_LOG(m_logger) << LOGFUNCTION
                        << " impactPosition: lat/lon" << impactPosition.lat() << "/" << impactPosition.lon()
                        << " UTM=" << CentralEffectSimulation::debug(CentralEffectSimulation::geographic2Utm(impactPosition));

@@ -55,7 +55,6 @@ public:
  AreaEffectSimulation::AesItemView itemView(const int &aesId) const { return m_aesItemViews.value(aesId); }

 protected:
-  NGL::INGLLogger &m_logger;
  void onSendCesHitOnBuildingReply(const Core::FunctionReplyObject &replyObject) override final;
  void onSendCesHitInformationReply(const Core::FunctionReplyObject &reply) override final;

@@ -113,7 +112,7 @@ private: // attributes
  QHash<int, AreaEffectSimulation::AesItemView>            m_aesItemViews; // key = aesItemId
  QHash<int, AreaEffectSimulation::AesEffectState>         m_explosionSingleState; // key = id value = state

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

 };

@@ -7,18 +7,17 @@
  */

 #include "handler_participant_area.h"
-#include <utility>
 #include "settings.h"
 #include "CentralEffectSimulation/handler_participant.h"


-#include <LtsUtils/dds_bitarray.h>
+#include <LtsUtilsCore/dds_bitarray.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <cmath>

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

 namespace dds
 {
@@ -73,6 +72,7 @@ HandlerParticipantArea::HandlerParticipantArea(const std::shared_ptr<CentralEffe
  , m_handlerParticipant(participantHandler)
  , m_handlerAesData(aesDataHandler)
  , m_handlerBuildingModel(buildingModelHandler)
+  , m_logger(getLogger("HandlerParticipantArea"))
 {
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -498,7 +498,7 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati
    return;

  DEBUG_LOG(m_logger) << "HandlerParticipantArea::calculateAesParticipant paricipantId: " << participantPos.participantId();
-  for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
+  for (const CentralEffectSimulation::AesItemViewUtm &itemView : qAsConst(m_aesItemViews))
  {
    DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
    switch (itemView.aesTypeId.underlying())
@@ -837,7 +837,7 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim
  const int effectType = static_cast<int>(EffectType::ExplosionSingle) & 0xffff;
  const QMap<int, BuildingModel *> buildingModels = m_handlerBuildingModel->buildingModels();
  const QList<CentralEffectSimulation::HandlerParticipant::CesParticipantData> participantPositions = m_handlerParticipant->positions().values();
-  for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : std::as_const(participantPositions))
+  for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition : qAsConst(participantPositions))
  {
    if (participantPosition.insideBuilding())
      continue;
@@ -70,7 +70,6 @@ public:
  bool init();

 protected:
-  NGL::INGLLogger &m_logger;
  void onSendCesHitReply(const Core::FunctionReplyObject &replyObject) override final;

 private Q_SLOTS:
@@ -158,7 +157,7 @@ private: // attributes
  QHash<int, QHash<int, QSet<EffectType>>> m_effectTypeStates; // QHash<aesItemId, QHash<participantId, QSet<effectStates>>>
  QHash<int, QHash<int, QSet<int>>> m_effectTypeBitFieldIndexes; // QHash<aesItemId, QHash<participantId, QSet<mineFieldBitIdx>>>

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

@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-#include "cespluginces2d_export.h"
+#include "ces_export.h"

 namespace Ces2D
 {
@@ -40,7 +40,7 @@ Ces2DInterfaceImpl::Ces2DInterfaceImpl(CentralEffectSimulation::Plugin::DataProv
  , m_db(db)
  , m_handlerBuildingData(handlerBuildingData)
  , m_handlerParticipant(handlerParticipant)
-  .getNGLLogger("CES.Plugin.CentralEffectSimulation2DInterfaceImpl"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("CES.Plugin.CentralEffectSimulation2DInterfaceImpl"))
 {
  Q_UNUSED(settings)
 }
@@ -18,7 +18,7 @@
 #include <CentralEffectSimulation/handler_building_data.h>
 #include <NGLLogger/INGLLogger.h>

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


 namespace Ces2D
@@ -65,7 +65,6 @@ private Q_SLOTS:
  bool init(int domainId, int exerciseId) override;
 private:

-NGL::INGLLogger &m_logger;
 private:
  CentralEffectSimulation::Plugin::DataProvider *m_pdp;
  std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
@@ -77,6 +76,9 @@ private:
  std::shared_ptr<HandlerBuildingModel>              m_handlerBuildingModel;    ///< Pointer to Building Model Handler
  std::shared_ptr<CentralEffectSimulation::HandlerParticipant>                m_handlerParticipant;      ///< Pointer to handler for all participants
  std::shared_ptr<HandlerParticipantArea>            m_handlerParticipantArea;  ///< Pointer to handler for participant outside from Buildings
+
+
+  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
 {