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/EffectShowManagement/CMakeLists.txt

@@ -32,13 +32,12 @@ CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 # Generate esm_db_impl.cpp/.h, esm_db.h
 CODEGEN_DATABASE(SRCS_common ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcEsmCommon SHARED  ${SRCS_common})
+NGL_ADD_LIBRARY(AAR SV WS svcEsmCommon SHARED  ${SRCS_common})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmCommon
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmCommon
   PRIVATE
     RTI::nddscpp2
@@ -48,7 +47,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmCommon
     ngldb
     NGLLogger
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmCommon)
 
 #
@@ -60,14 +58,13 @@ SET(SRCS_client
 # generate esm_[d|f]tc.h, esm_[d|f]tc_impl.[cpp|h]
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcEsmClient SHARED ${SRCS_client})
+NGL_ADD_LIBRARY(AAR SV WS svcEsmClient SHARED ${SRCS_client})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmClient
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmClient
   PRIVATE
     RTI::nddscpp2
@@ -76,7 +73,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmClient
     svcEsmCommon
     ddsftc
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmClient)
 
 #
@@ -133,14 +129,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
 CODEGEN_SQL(SRCS_server ${xml_FILE})
 
 NGL_ADD_SVC_ICON(SRCS_server)
-NGL_ADD_LIBRARY2(AAR SV svcEsmServer SHARED ${SRCS_server})
+NGL_ADD_LIBRARY(AAR SV svcEsmServer SHARED ${SRCS_server})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmServer
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEsmServer
   PRIVATE
     RTI::nddscpp2
@@ -163,7 +158,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmServer
     ddsconnector
     NGLLogger
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEsmServer)
 
 #

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.cpp

@@ -16,6 +16,7 @@ namespace EffectShowManagement
 
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : m_ddsConnector(ddsConnector)
+  , m_logger(getLogger("DdsHandler"))
 {
   DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h

@@ -18,7 +18,7 @@
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/aes_ftc.h>
 
-#include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <ProjectDataManagement/pdm_dtc.h>
 #include <MeteoDataManagement/mdm_dtc.h>
 #include <TrainingAreaBase/tab_dtc.h>
@@ -65,7 +65,6 @@ public:
   qint64 currentPartitionTime() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::TopicLockMaster>      m_topicLockMaster;
   std::shared_ptr<Core::Interface::Dtc>       m_dtcCore;
@@ -80,6 +79,7 @@ private:
   std::shared_ptr<MeteoDataManagement::Interface::Dtc>    m_dtcMdm;
   std::shared_ptr<TrainingAreaBase::Interface::Dtc>       m_dtcTab;
   std::shared_ptr<TrainingAreaBase::Interface::Ftc>       m_ftcTab;
+  NGL::INGLLogger          &m_logger;
 };
 
 } // namespace EffectShowManagement

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.cpp

@@ -6,8 +6,8 @@
   */
 
 #include "effect_show_effect_cluster.h"
-#include <QtCore/QJsonDocument>
-#include <QtCore/QObject>
+#include <QJsonDocument>
+#include <QObject>
 #include "settings.h"
 
 const static int DEFAULT_EFFECT_DURATION = 777777;
@@ -15,10 +15,12 @@ const static int DEFAULT_EFFECT_DURATION = 777777;
 namespace EffectShowManagement
 {
 EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::EffectCluster &effectCluster,
-                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_effectCluster(effectCluster)
+                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
+  : m_effectCluster(effectCluster)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_numOfEffectShows(0)
+  , m_logger(getLogger("EffectShowEffectCluster"))
+{
 }
 
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_effect_cluster.h

@@ -71,7 +71,6 @@ public:
   int getShotsPerArea() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -115,7 +114,6 @@ private:
   double rotationRad() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::EffectCluster const  m_effectCluster;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
@@ -124,6 +122,9 @@ private:
   areas_t m_areasDepth; // squares in y-direction
 
   LtsCoordTrans::UtmCoordinate m_lowerLeftPos;
+
+  NGL::INGLLogger              &m_logger;
+
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.cpp

@@ -10,10 +10,12 @@
 namespace EffectShowManagement
 {
 EffectShowExplosionArea::EffectShowExplosionArea(const AreaEffectSimulation::ExplosionArea &explosionArea,
-                                                 const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionArea(explosionArea)
+                                                 const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
+  : m_explosionArea(explosionArea)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_numOfEffectShows(0)
+  , m_logger(getLogger("EffectShowExplosionArea"))
+{
 }
 
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_area.h

@@ -73,7 +73,6 @@ public:
   int getShotsPerArea() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -117,7 +116,6 @@ private:
   double rotationRad() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::ExplosionArea const  m_explosionArea;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
@@ -126,6 +124,9 @@ private:
   areas_t m_areasDepth; // squares in y-direction
 
   LtsCoordTrans::UtmCoordinate m_lowerLeftPos;
+
+  NGL::INGLLogger              &m_logger;
+
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.cpp

@@ -10,10 +10,12 @@
 namespace EffectShowManagement
 {
 EffectShowExplosionCluster::EffectShowExplosionCluster(const AreaEffectSimulation::ExplosionCluster &explosionCluster,
-                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionCluster(explosionCluster)
+                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData)
+  : m_explosionCluster(explosionCluster)
   , m_handlerPdmData(handlerPdmData)
-  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_numOfEffectShows(0)
+  , m_logger(getLogger("EffectShowExplosionCluster"))
+{
 }
 
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_explosion_cluster.h

@@ -71,7 +71,6 @@ public:
   int getShotsPerArea() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the square of the each effect area.
     */
@@ -115,7 +114,6 @@ private:
   double rotationRad() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::ExplosionCluster const  m_explosionCluster;
   std::shared_ptr<HandlerPdmData>            m_handlerPdmData;
   int m_numOfEffectShows;
@@ -124,6 +122,9 @@ private:
   areas_t m_areasDepth; // squares in y-direction
 
   LtsCoordTrans::UtmCoordinate m_lowerLeftPos;
+
+  NGL::INGLLogger              &m_logger;
+
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.cpp

@@ -7,15 +7,17 @@
 
 #include "effect_show_mine_area.h"
 
-#include <QtCore/QLineF>
+#include <QLineF>
 
 namespace EffectShowManagement
 {
-EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &mineArea) : m_mineArea(mineArea)
+EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &mineArea)
+  : m_mineArea(mineArea)
   , m_segment(getEffectShowSegment(mineArea))
   , m_utmZone(-1)
-  , m_rotation(0.0),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+  , m_rotation(0.0)
+  , m_logger(getLogger("EffectShowMineArea"))
+{
 }
 
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/effect_show_mine_area.h

@@ -11,7 +11,7 @@
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <EffectShowManagement/esm_db.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QtCore/QPointF>
+#include <QPointF>
 
 namespace EffectShowManagement
 {
@@ -60,7 +60,6 @@ public:
   }
 
 private:
-  NGL::INGLLogger &m_logger;
   /**
     * @brief Calculates the center position and the lower left position of the effect area.
     */
@@ -90,13 +89,13 @@ private:
   static LtsCoordTrans::UtmCoordinate rotate(const LtsCoordTrans::UtmCoordinate &p, const LtsCoordTrans::UtmCoordinate &c, double angle);
 
 private:
-  NGL::INGLLogger &m_logger;
   AreaEffectSimulation::MineArea const     m_mineArea;
   const AreaEffectSimulation::MineSegment &m_segment;
   int m_utmZone;
   LtsCoordTrans::UtmCoordinate m_centerPos;
   LtsCoordTrans::UtmCoordinate m_lowerLeftPos;
   double                       m_rotation; // math angle [degree]
+  NGL::INGLLogger              &m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp

@@ -8,7 +8,7 @@
   */
 
 #include "esm_convert_from_tab.h"
-#include <LtsUtils/qbytearray_byteaccess.h>
+#include <LtsUtilsCore/qbytearray_byteaccess.h>
 
 
 namespace EffectShowManagement

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.h

@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <EffectShowManagement/esm_db.h>
-#include <QtCore/QString>
+#include <QString>
 
 namespace EffectShowManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.cpp

@@ -8,9 +8,9 @@
   */
 
 #include "esm_convert_to_tab.h"
-#include <LtsUtils/qbytearray_byteaccess.h>
-#include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QtCore/QByteArray>
+#include <LtsUtilsCore/qbytearray_byteaccess.h>
+#include <LtsUtilsCore/dds_vector.h>
+#include <QByteArray>
 
 namespace EffectShowManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_to_tab.h

@@ -10,7 +10,7 @@
 #pragma once
 #include <TrainingAreaBase/tab_dtc.h>
 #include <MeteoDataManagement/mdm_dtc.h>
-#include <QtCore/QString>
+#include <QString>
 
 namespace EffectShowManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.cpp

@@ -4,7 +4,7 @@
   * $HeadURL$
   * $Author$
   */
-#include <QtCore/QVector>
+#include <QVector>
 #include "handler_aes_data.h"
 #include "object_aes_data.h"
 #include "handler_effect_show_vehicle_status.h"
@@ -15,9 +15,11 @@
 
 using namespace EffectShowManagement;
 
-HandlerAesData::HandlerAesData(Initialization *mainHandler) : QObject()
-  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+HandlerAesData::HandlerAesData(Initialization *mainHandler)
+  : QObject()
+  , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerAesData"))
+{
 } // end of ctor()
 //=============================================================================
 HandlerAesData::~HandlerAesData()

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_aes_data.h

@@ -11,7 +11,7 @@
 #include "logger.h"
 #include "handler_effect_show.h"
 #include <AreaEffectSimulation/aes_dtc.h>
-#include <QtCore/QMap>
+#include <QMap>
 
 namespace EffectShowManagement
 {
@@ -76,7 +76,6 @@ private Q_SLOTS:
   void onMineAreaChanged(const AreaEffectSimulation::MineArea &data, DataModification modType);
 
 private:
-  NGL::INGLLogger &m_logger;
   /**
    * @brief Checks, if the status of the area effect simulation allows a treatment of its data.
    * @param effectStateId Status of the area effect simulatin data.
@@ -94,6 +93,8 @@ private:
 private: // attributes
   QMap<int, ObjectAesData *> m_AesDataObjMap;
   Initialization           *m_mainHandler;
+  NGL::INGLLogger           &m_logger;
+
 };
 } // namespace EffectShowManagement
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp

@@ -7,7 +7,6 @@
   */
 
 #include "handler_effect_show.h"
-#include <utility>
 #include "handler_ppm_data.h"
 #include "handler_tab_data.h"
 #include "handler_mdm_data.h"
@@ -33,6 +32,7 @@ HandlerEffectShow::HandlerEffectShow(Initialization *mainHandler,
   , m_cleanupTimer(new QTimer(this))
   , m_timerMeteoData(new QTimer(this))
   , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerEffectShow"))
 {} // end of ctor()
 //=============================================================================
 
@@ -610,7 +610,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimulation::MineArea &data)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == data.id())
     {
@@ -624,7 +624,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimul
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == data.id())
     {
@@ -638,7 +638,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffect
 
 void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEffectSimulation::ExplosionCluster &data)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == data.id())
     {
@@ -652,7 +652,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEff
 
 void HandlerEffectShow::updateEffectShowsRelatedToEffectCluster(const AreaEffectSimulation::EffectCluster &data)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == data.id())
     {
@@ -726,7 +726,7 @@ void HandlerEffectShow::modifyEffectShows(const QVector<Database::EsmEffectShow>
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == idAes)
       triggerEffectShowOrder(obj);
@@ -735,7 +735,7 @@ void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes)
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == idAes)
       triggerEffectShowStop(obj);
@@ -744,7 +744,7 @@ void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes)
 //-------------------------------------------------------------------------------
 void HandlerEffectShow::continueEffectShowsRelatedToAes(int idAes)
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     if (obj->getIdAES() == idAes)
       triggerEffectShowContinue(obj);
@@ -891,7 +891,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
 //-----------------------------------------------------------------------------
 void HandlerEffectShow::onSendMeteoData()
 {
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     const Database::EsmEffectShow &effectShow = obj->getData();
     if (effectShow.esmParticipantId == -1)
@@ -909,7 +909,7 @@ void HandlerEffectShow::onCleanUp()
 {
   DEBUG_LOG(m_logger) << "Start Cleanup ";
   QVector<ObjectEffectShow * > objects;
-  for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
+  for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
   {
     const Database::EsmEffectShow &effectShow = obj->getData();
     if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0  || effectShow.id  <= 0)

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.h

@@ -7,8 +7,8 @@
   */
 #pragma once
 
-#include <QtCore/QHash>
-#include <QtCore/QTimer>
+#include <QHash>
+#include <QTimer>
 
 #include "dds_handler.h"
 #include "initialization.h"
@@ -182,5 +182,7 @@ private:
   QTimer                 *m_timerMeteoData;
 
   Initialization         *m_mainHandler;
+  NGL::INGLLogger        &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp

@@ -13,8 +13,8 @@
 #include "esm_db.h"
 #include "initialization.h"
 
-#include <QtCore/QTimer>
-#include <QtCore/QCoreApplication>
+#include <QTimer>
+#include <QCoreApplication>
 
 namespace EffectShowManagement
 {
@@ -25,6 +25,7 @@ HandlerEffectShowActorRelocation::HandlerEffectShowActorRelocation(Initializatio
   , EffectShowActorRelocationModifyRequestHandler(mainHandler->dds()->fts())
   , EffectShowActorRelocationRemoveRequestHandler(mainHandler->dds()->fts())
   , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerEffectShowActorRelocation"))
 {}
 //=============================================================================
 HandlerEffectShowActorRelocation::~HandlerEffectShowActorRelocation()
@@ -145,7 +146,7 @@ void HandlerEffectShowActorRelocation::onEffectShowActorRelocationRemoveRequest(
 
   ret = ifs->removeObject();
   if (ret.error())
-    ERROR_LOG(m_logger) << Q_FUNC_INFO << ret();
+    ERROR_LOG(m_logger) << LOGFUNCTION << ret();
   else
   {
     // trigger relocation telegram to effect show actor

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.h

@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QQueue>
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "dds_handler.h"
 #include "esm_convert_from_tab.h"
@@ -57,7 +57,6 @@ public:
   void relocationOrderConfirmationReceived(const ConvertFromTab::OrderConfirmation_t &orderConfirmation);
 
 private:
-  NGL::INGLLogger &m_logger;
   void onEffectShowActorRelocationModifyRequest(const rti::core::SampleIdentity &cookie,
                                                 const EffectShowActorRelocation &request) override final;
   Core::FunctionReplyObject effectShowActorRelocationModifyRequest(const EffectShowActorRelocation &request);
@@ -67,7 +66,6 @@ private:
 
 
 private:
-  NGL::INGLLogger &m_logger;
   QMap<int, ObjectEffectShowActorRelocation *>       m_effectShowActorRelocationObjMap;
   struct Completed_t
   {
@@ -76,5 +74,7 @@ private:
   };
   QQueue<Completed_t>        m_completed;  // IDs and timestamp of the completed relocations
   Initialization                *m_mainHandler;
+  NGL::INGLLogger            &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.cpp

@@ -14,15 +14,17 @@
 #include "esm_db.h"
 #include "initialization.h"
 
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 
 namespace EffectShowManagement
 {
 //=============================================================================
 HandlerEffectShowVehicleStatus::HandlerEffectShowVehicleStatus(Initialization *mainHandler,
-                                                               QObject *parent) : QObject(parent)
-  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+                                                               QObject *parent)
+  : QObject(parent)
+  , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerEffectShowVehicleStatus"))
+{
   m_timerVehicleStatus.setSingleShot(true);
 }
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_vehicle_status.h

@@ -7,9 +7,9 @@
   */
 #pragma once
 
-#include <QtCore/QMap>
-#include <QtCore/QTimer>
-#include <QtCore/QObject>
+#include <QMap>
+#include <QTimer>
+#include <QObject>
 
 #include "dds_handler.h"
 #include "esm_convert_from_tab.h"
@@ -87,16 +87,16 @@ public Q_SLOTS:
   void onTimeoutVehicleStatus();
 
 private:
-  NGL::INGLLogger &m_logger;
   static const qint64 statusTimeout = 1800000; // 30 min timeout effect show vehicle status
   static const qint64 delayAfterStart = 20000; // 20 seconds delay for status requests after service start
   static const qint64 statusRequestInterval = 5000; // Status request time interval of 5 seconds
 
 private:
-  NGL::INGLLogger &m_logger;
   QMap<int, ObjectEffectShowVehicleStatus *>       m_effectShowVehicleStatusObjMap; // key = equipment number
   QVector<int> m_statusRequest; // List of equipment numbers; Order List for request of vehicle status.
   QTimer       m_timerVehicleStatus;
   Initialization                *m_mainHandler;
+  NGL::INGLLogger            &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.cpp

@@ -6,7 +6,6 @@
   */
 
 #include "handler_mdm_data.h"
-#include <utility>
 #include "initialization.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include "settings.h"
@@ -14,9 +13,11 @@
 using namespace EffectShowManagement;
 //=============================================================================
 HandlerMdmData::HandlerMdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                               QObject *parent) : QObject(parent)
-  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+                               QObject *parent)
+  : QObject(parent)
+  , m_ddsHandler(ddsHandler)
+  , m_logger(getLogger("HandlerMdmData"))
+{
 }
 
 //=============================================================================
@@ -48,7 +49,7 @@ bool HandlerMdmData::getNearestWeather(const Core::GeoPosition2D &pos,
   double nearestDistanceSquared = std::numeric_limits<double>::max();
 
   bool found = false;
-  for (const auto &md : std::as_const(m_meteoData))
+  for (const auto &md : qAsConst(m_meteoData))
   {
     if (md.isStaticMeteoData())
       continue;

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_mdm_data.h

@@ -8,7 +8,7 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QtCore/QHash>
+#include <QHash>
 #include <MeteoDataManagement/mdm_dtc.h>
 
 namespace EffectShowManagement
@@ -40,8 +40,8 @@ private Q_SLOTS:
   void onMeteoDataChanged(const MeteoDataManagement::MeteoData &data, DataModification modType);
 
 private:
-  NGL::INGLLogger &m_logger;
   QHash<int, MeteoDataManagement::MeteoData> m_meteoData;
   std::shared_ptr<DdsHandler> m_ddsHandler;
+  NGL::INGLLogger             &m_logger;
 };
 } // namespace EffectShowManagement

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.cpp

@@ -15,9 +15,12 @@ namespace EffectShowManagement
 //=============================================================================
 
 HandlerPdmData::HandlerPdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
-                               QObject *parent) : QObject(parent)
-  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+                               QObject *parent)
+
+  : QObject(parent)
+  , m_ddsHandler(ddsHandler)
+  , m_logger(getLogger("HandlerPdmData"))
+{
 } // end of ctor()
 //=============================================================================
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_pdm_data.h

@@ -10,7 +10,7 @@
 
 #include "dds_handler.h"
 #include "logger.h"
-#include <QtCore/QHash>
+#include <QHash>
 #include <ProjectDataManagement/pdm_dtc.h>
 
 // Project Data Management - Handling for Effect Show Actors
@@ -35,9 +35,8 @@ public:
   int getCadence(const int chargeId) const;
 
 private: // attributes
-
-NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler> m_ddsHandler;
+  NGL::INGLLogger             &m_logger;
 };
 } // namespace EffectShowManagement
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.cpp

@@ -15,9 +15,11 @@ using namespace EffectShowManagement;
 //=============================================================================
 
 HandlerPpmData::HandlerPpmData(Initialization *mainHandler,
-                               QObject     *parent) : QObject(parent)
-  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+                               QObject     *parent)
+  : QObject(parent)
+  , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerPpmData"))
+{
 } // end of ctor()
 //=============================================================================
 
@@ -52,7 +54,7 @@ HandlerPpmData::Participant_t HandlerPpmData::getIdAndNameOfEffectShowActor(int
       return p;
   }
 
-  WARNING_LOG(m_logger) << Q_FUNC_INFO << " Equipment Number not found: " << equipmentNum;
+  WARNING_LOG(m_logger) << LOGFUNCTION << " Equipment Number not found: " << equipmentNum;
   return Participant_t(); // participant not available
 
 } // end of getIdAndNameOfEffectShowActor()
@@ -63,7 +65,7 @@ int HandlerPpmData::getEquipmentNumber(int id) const
   auto it = m_participant.find(id);
   if (it == m_participant.end())
   {
-    WARNING_LOG(m_logger) << Q_FUNC_INFO << " Participant(" << id << ") not found. ";
+    WARNING_LOG(m_logger) << LOGFUNCTION << " Participant(" << id << ") not found. ";
     return -1; // participant not available
   }
   return it.value().equipmentNumber;

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_ppm_data.h

@@ -10,8 +10,8 @@
 
 #include "initialization.h"
 #include "logger.h"
-#include <QtCore/QMap>
-#include <ParticipantManagement/ppm.hpp>
+#include <QMap>
+#include <ParticipantManagement/ppm_dtc.h>
 
 // Participand Management-Handling for Effect Show Actors
 
@@ -71,10 +71,10 @@ private Q_SLOTS:
   void onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType);
 
 private:
-  NGL::INGLLogger &m_logger;
   QMap<int, Participant_t> m_participant; // key = ID
 
   Initialization   *m_mainHandler;
+  NGL::INGLLogger  &m_logger;
 };
 } // namespace EffectShowManagement
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.cpp

@@ -5,8 +5,8 @@
   * $Author$
   * Created by hjl, SLSE, 2017-02-20
   */
-#include <QtCore/QVector>
-#include <LtsUtils/LtsUtilsCore/dds_vector.h>
+#include <QVector>
+#include <LtsUtilsCore/dds_vector.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include "initialization.h"
 #include "handler_tab_data.h"
@@ -31,6 +31,7 @@ HandlerTabData::HandlerTabData(Initialization *mainHandler,
 
   : QObject(parent)
   , m_mainHandler(mainHandler)
+  , m_logger(getLogger("HandlerTabData"))
 {
 } // end of ctor()
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_tab_data.h

@@ -102,7 +102,6 @@ public:
   void sendAdlerFqFb(const int aesId);
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onSendFireSmokeMarkerDataReply(const Core::FunctionReplyObject &reply) override final;
   void onAdlerFqFbReply(const Core::FunctionReplyObject &reply) override final;
 
@@ -114,6 +113,7 @@ private:
 
 private: // attributes
   Initialization      *m_mainHandler;
+  NGL::INGLLogger  &m_logger;
   QMap<int, EffectShowManagement::EffectShowVehicleStatus> m_effectShowVehicleStatus;
 
 };

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/initialization.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <EffectShowManagement/esm_db.h>
 #include "dds_handler.h"
-#include "svcesmserver_export.h"
+#include "esm_export.h"
 #include "logger.h"
 
 namespace NGLDB
@@ -52,7 +52,6 @@ public:
   int exerciseId() const;
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
 
@@ -64,6 +63,9 @@ private:
   std::shared_ptr<HandlerEffectShow>     m_handlerEffectShow;
   std::shared_ptr<HandlerEffectShowActorRelocation> m_handlerEffectShowActorRelocation;
   std::shared_ptr<HandlerEffectShowVehicleStatus>   m_handlerEffectShowVehicleStatus;
+
+  NGL::INGLLogger                       &m_logger;
+
 };
 
 } // namespace EffectShowManagement

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/logger.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include "svcesmcommon_export.h"
+#include "esm_export.h"
 
 namespace EffectShowManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp

@@ -9,15 +9,17 @@
 #include "effect_show_mine_area.h"
 
 #include "initialization.h"
-#include <QtCore/QLineF>
+#include <QLineF>
 
 namespace EffectShowManagement
 {
 //=============================================================================
 ObjectAesData::ObjectAesData(Initialization *mainHandler,
-                             QObject     *parent) : QObject(parent)
-  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
+                             QObject     *parent)
+  : QObject(parent)
+  , m_mainHandler(mainHandler)
+  , m_logger(getLogger("ObjectAesData"))
+{
 }
 //=============================================================================
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h

@@ -6,11 +6,11 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <EffectShowManagement/esm_db.h>
@@ -92,8 +92,10 @@ public:
   static Database::EsmAesData asEsmAesData(const AreaEffectSimulation::EffectCluster &data);
 
 private:
-  NGL::INGLLogger &m_logger;
   Initialization          *m_mainHandler;
   Database::EsmAesData m_data;
+
+  NGL::INGLLogger      &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp

@@ -16,6 +16,7 @@ namespace EffectShowManagement
 ObjectEffectShow::ObjectEffectShow(Initialization *mainHandler, QObject *parent)
   : QObject(parent)
   , m_mainHandler(mainHandler)
+  , m_logger(getLogger("ObjectEffectShow"))
 {
 } // end of ctor()
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h

@@ -6,13 +6,13 @@
   */
 #pragma once
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "dds_handler.h"
 #include "esm_convert_to_tab.h"
 #include "esm_convert_from_tab.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 #include <EffectShowManagement/esm_db.h>
 #include <EffectShowManagement/esm_dts.h>
 
@@ -60,9 +60,11 @@ public Q_SLOTS:
   void onPublishData();
 
 private:
-  NGL::INGLLogger &m_logger;
   Initialization         *m_mainHandler;
   Database::EsmEffectShow m_data;
   bool                    m_bRemoveFromDdsOnDestruction = true;
+
+  NGL::INGLLogger &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp

@@ -14,6 +14,7 @@ namespace EffectShowManagement
 
 ObjectEffectShowActorRelocation::ObjectEffectShowActorRelocation(Initialization *mainHandler)
   : m_mainHandler(mainHandler)
+  , m_logger(getLogger("ObjectEffectShowActorRelocation"))
 {
 }
 //=============================================================================

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h

@@ -10,7 +10,7 @@
 #include "esm_convert_to_tab.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 #include <EffectShowManagement/esm_db.h>
 #include <EffectShowManagement/esm_dts.h>
 
@@ -51,11 +51,13 @@ public:
   static Database::EsmEffectShowActorRelocation ddsToDb(const EffectShowManagement::EffectShowActorRelocation &ddsData);
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
   Initialization                                       *m_mainHandler;
   Database::EsmEffectShowActorRelocation   m_data;
+
+  NGL::INGLLogger            &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp

@@ -14,6 +14,7 @@ namespace EffectShowManagement
 
 ObjectEffectShowVehicleStatus::ObjectEffectShowVehicleStatus(Initialization *mainHandler)
   : m_mainHandler(mainHandler)
+  , m_logger(getLogger("ObjectEffectShowVehicleStatus"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h

@@ -11,7 +11,7 @@
 #include "handler_ppm_data.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <EffectShowManagement/esm_db.h>
@@ -61,11 +61,13 @@ public:
 
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
   Initialization                            *m_mainHandler;
   Database::EsmEffectShowVehicleStatus   m_data;
+
+  NGL::INGLLogger            &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QtCore/QString>
+#include <QString>
 
 namespace NGL
 {