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

@@ -39,13 +39,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 # Generate evl_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcEvlCommon SHARED ${SRCS_common})
+NGL_ADD_LIBRARY(AAR SV WS svcEvlCommon SHARED ${SRCS_common})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlCommon
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlCommon
   PRIVATE
     RTI::nddscpp2
@@ -55,7 +54,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlCommon
     NGLLogger
     ngldb
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlCommon)
 
 #
@@ -67,14 +65,13 @@ SET(SRCS_client
 # generate evl_[d|f]tc.h, evl_[d|f]tc_impl.[cpp|h]
 CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV WS svcEvlClient SHARED ${SRCS_client})
+NGL_ADD_LIBRARY(AAR SV WS svcEvlClient SHARED ${SRCS_client})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlClient
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlClient
   PRIVATE
     RTI::nddscpp2
@@ -83,7 +80,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlClient
     svcEvlCommon
     ddsftc
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlClient)
 
 #
@@ -125,14 +121,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
 # Generate evl.sql, evl.xml
 CODEGEN_SQL(SRCS_server ${xml_FILE})
 
-NGL_ADD_LIBRARY2(AAR SV svcEvlServer SHARED ${SRCS_server})
+NGL_ADD_LIBRARY(AAR SV svcEvlServer SHARED ${SRCS_server})
 NGL_TARGET_INCLUDE_DIRECTORIES(svcEvlServer
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcEvlServer
   PRIVATE
     RTI::nddscpp2
@@ -148,7 +143,6 @@ NGL_TARGET_LINK_LIBRARIES(svcEvlServer
     ngltools
     LtsCoordTrans
 )
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcEvlServer)
 
 #

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp

@@ -9,14 +9,14 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QtCore/QTimer>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QTimer>
+#include <QDateTime>
+#include <QString>
+#include <QVector>
 
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonDocument>
-#include <QtTest/QTest>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QTest>
 
 #include <Evaluations/evl_ftc.h>
 #include <Evaluations/evl_dtc.h>
@@ -28,6 +28,7 @@ using namespace Evaluations;
 //-----------------------------------------------------------------------------
 EvlTests::EvlTests(QObject *parent)
   : QObject(parent)
+  , m_logger(getLogger("EvlTests"))
 {
   qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.h

@@ -72,7 +72,6 @@ protected Q_SLOTS:
   void onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType);
 
 protected:
-  NGL::INGLLogger &m_logger;
   // Callbackfunctions for FTC
   void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final;
   void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -123,6 +122,8 @@ private:
   m_eTestStep = eUnknown;
 
   bool             m_bTestsSuccessful = true;
+  NGL::INGLLogger &m_logger;
+
 };
 
 } // namespace Evaluations

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

@@ -15,6 +15,7 @@ namespace Evaluations
 
 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/Evaluations/dds_handler.h

@@ -28,10 +28,11 @@ public:
   std::shared_ptr<Evaluations::Interface::Fts> fts() const { return m_ddsFts; }
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DDSConnector::DdsConnector>   m_ddsConnector;
   std::shared_ptr<Evaluations::Interface::Dts>  m_ddsDts;
   std::shared_ptr<Evaluations::Interface::Fts>  m_ddsFts;
+
+  NGL::INGLLogger          &m_logger;
 };
 
 } // namespace Evaluations

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/evl_db_impl_custom.cpp

@@ -9,7 +9,7 @@
 #include "evl_db_impl_custom.h"
 #include <ngldb/nsqlquery.h>
 #include <ngldb/sql_query_janitor.h>
-#include <QtCore/QRegularExpression>
+#include <QRegularExpression>
 
 namespace Evaluations
 {

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.cpp

@@ -18,6 +18,7 @@ HandlerComment::HandlerComment(const std::shared_ptr<DdsHandler> &ddsHandler,
   , Interface::Fts::EvlSchemaModifyRequestHandler(ddsHandler->fts())
   , m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("HandlerComment"))
 {}
 
 HandlerComment::~HandlerComment()

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_comment.h

@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QtCore/QHash>
+#include <QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
@@ -30,7 +30,6 @@ public:
   bool init();
 
 private:
-  NGL::INGLLogger &m_logger;
   void onEvlCommentModifyRequest(const rti::core::SampleIdentity &cookie,
                                  const EvlCommentModifyRequest &request) override final;
 
@@ -38,12 +37,12 @@ private:
                                 const EvlSchemaModifyRequest &request) override final;
 
 private:
-  NGL::INGLLogger &m_logger;
   void createDefaultSchema();
   QHash<int, ObjectComment *> m_mapObjectComment;
   QHash<int, ObjectSchema *> m_mapObjectSchema;
 
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
+  NGL::INGLLogger &m_logger;
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.cpp

@@ -21,6 +21,7 @@ HandlerCriterium::HandlerCriterium(const std::shared_ptr<DdsHandler> &ddsHandler
   , Interface::Fts::EvlElementRemoveRequestHandler(ddsHandler->fts())
   , m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("HandlerCriterium"))
 {}
 
 HandlerCriterium::~HandlerCriterium()

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_criterium.h

@@ -7,7 +7,7 @@
   */
 #pragma once
 
-#include <QtCore/QHash>
+#include <QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
@@ -31,7 +31,6 @@ public:
   bool init();
 
 private:
-  NGL::INGLLogger &m_logger;
   void onEvlCriteriumModifyRequest(const rti::core::SampleIdentity &cookie,
                                    const EvlCriteriumModifyRequest &request) override final;
   void onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
@@ -42,9 +41,10 @@ private:
                                  const EvlElementRemoveRequest &request) override final;
 
 private:
-  NGL::INGLLogger &m_logger;
   QHash<int, ObjectCriterium *>      m_criteriumObjMap;
   std::shared_ptr<DdsHandler>        m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
+  NGL::INGLLogger                   &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.cpp

@@ -6,7 +6,6 @@
   */
 
 #include "handler_san_nine_liner.h"
-#include <utility>
 #include "object_san_nine_liner.h"
 #include "object_san_category_line.h"
 #include "san_category_line_json.h"
@@ -14,7 +13,7 @@
 
 #include "settings.h"
 
-#include <QtCore/QJsonDocument>
+#include <QJsonDocument>
 
 namespace Evaluations
 {
@@ -25,6 +24,7 @@ HandlerSanNineLiner::HandlerSanNineLiner(const std::shared_ptr<DdsHandler> &ddsH
   , Interface::Fts::SanNineLinerRemoveRequestHandler(ddsHandler->fts())
   , m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("HandlerSanNineLiner"))
 {}
 
 HandlerSanNineLiner::~HandlerSanNineLiner()
@@ -75,7 +75,7 @@ bool HandlerSanNineLiner::init()
   }
 
   // publish
-  for (ObjectSanNineLiner *objSan : std::as_const(m_mapObjectSanNineLiner))
+  for (ObjectSanNineLiner *objSan : qAsConst(m_mapObjectSanNineLiner))
     objSan->onPublishData();
 
   return true;
@@ -142,7 +142,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
   QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
   INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
 
-  for (Database::SanCategoryLine cl : std::as_const(linesCategory))
+  for (Database::SanCategoryLine cl : qAsConst(linesCategory))
   {
     ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db));
     ret = ifsCl->createObject(cl);

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/handler_san_nine_liner.h

@@ -6,7 +6,7 @@
   */
 #pragma once
 
-#include <QtCore/QHash>
+#include <QHash>
 
 #include "dds_handler.h"
 #include "logger.h"
@@ -30,7 +30,6 @@ public:
   bool init();
 
 private:
-  NGL::INGLLogger &m_logger;
   void onSanNineLinerModifyRequest(const rti::core::SampleIdentity &cookie,
                                  const SanNineLinerModifyRequest &request) override final;
 
@@ -38,11 +37,11 @@ private:
                                 const Core::RemoveElementRequest &request) override final;
 
 private:  
-  NGL::INGLLogger &m_logger;
   QHash<int, ObjectSanNineLiner *> m_mapObjectSanNineLiner;
 
   std::shared_ptr<DdsHandler> m_ddsHandler;
   std::shared_ptr<DatabaseInterface> m_db;
+  NGL::INGLLogger &m_logger;
 };
 
 } // Namespace Evaluations

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp

@@ -23,6 +23,7 @@ Initialization::Initialization()
   , m_dbHandler(nullptr)
   , m_handlerCriterium(nullptr)
   , m_handlerComment(nullptr)
+  , m_logger(getLogger("Initialization"))
 {}
 
 Initialization::~Initialization()

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

@@ -8,7 +8,7 @@
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <ngldb/db_service_handler.h>
-#include "svcevlserver_export.h"
+#include <Evaluations/evl_export.h>
 #include <Evaluations/logger.h>
 
 class QSqlDatabase;
@@ -31,11 +31,12 @@ public:
   bool loadFromDatabase();
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DbHandler>             m_dbHandler;
   std::unique_ptr<HandlerCriterium>      m_handlerCriterium;
   std::unique_ptr<HandlerComment>        m_handlerComment;
   std::unique_ptr<HandlerSanNineLiner>   m_handlerSanNineLiner;
+  NGL::INGLLogger                       &m_logger;
+
 };
 } // namespace Evaluations

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

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
-#include "svcevlcommon_export.h"
+#include "evl_export.h"
 
 namespace Evaluations
 {

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.cpp

@@ -13,6 +13,7 @@ ObjectComment::ObjectComment(const std::shared_ptr<DdsHandler> &ddsHandler,
                              const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectComment"))
 {
 }
 
@@ -78,6 +79,7 @@ ObjectSchema::ObjectSchema(const std::shared_ptr<DdsHandler> &ddsHandler,
                            const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectSchema"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>
@@ -31,13 +31,14 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DatabaseInterface>     m_db;
   Database::EvlComment          m_data;
+
+  NGL::INGLLogger            &m_logger;
 };
 
 class ObjectSchema final
@@ -54,12 +55,13 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DatabaseInterface>     m_db;
   Database::EvlSchema m_data;
+
+  NGL::INGLLogger            &m_logger;
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.cpp

@@ -6,7 +6,6 @@
   */
 
 #include "object_criterium.h"
-#include <utility>
 #include "object_evaluation_element.h"
 
 namespace Evaluations
@@ -16,6 +15,7 @@ ObjectCriterium::ObjectCriterium(const std::shared_ptr<DdsHandler> &ddsHandler,
                                  const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectCriterium"))
 {
 }
 
@@ -55,7 +55,7 @@ Core::FunctionReplyObject ObjectCriterium::removeObject()
   if (!m_db->removeEvlCriterium(m_data.id))
     return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "EvlCriterium with id %1 can not be removed")).arg(m_data.id);
 
-  for (ObjectEvaluationElement *oee : std::as_const(m_elementsMap))
+  for (ObjectEvaluationElement *oee : qAsConst(m_elementsMap))
     oee->removeObject();
   qDeleteAll(m_elementsMap);
   m_elementsMap.clear();

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>
@@ -39,10 +39,12 @@ protected Q_SLOTS:
   void onPublishData();
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>             m_ddsHandler;
   std::shared_ptr<DatabaseInterface>      m_db;
   Database::EvlCriterium                  m_data;
   QHash<qint32, ObjectEvaluationElement *> m_elementsMap;
+
+  NGL::INGLLogger            &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.cpp

@@ -14,6 +14,7 @@ ObjectEvaluationElement::ObjectEvaluationElement(const std::shared_ptr<DdsHandle
                                                  const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectEvaluationElement"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>
@@ -35,9 +35,11 @@ protected Q_SLOTS:
   void onPublishData();
 
 private:
-  NGL::INGLLogger &m_logger;
   std::shared_ptr<DdsHandler>         m_ddsHandler;
   std::shared_ptr<DatabaseInterface>  m_db;
   Database::EvlElement                m_data;
+
+  NGL::INGLLogger                    &m_logger;
+
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.cpp

@@ -13,6 +13,7 @@ ObjectSanCategoryLine::ObjectSanCategoryLine(const std::shared_ptr<DdsHandler> &
                              const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectSanCategoryLine"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>
@@ -31,13 +31,14 @@ public:
   int getId() const { return m_data.id; }
 
 protected:
-  NGL::INGLLogger &m_logger;
   void onPublishData();
 
 private:
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DatabaseInterface>     m_db;
   Database::SanCategoryLine              m_data;
+
+  NGL::INGLLogger            &m_logger;
 };
 
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.cpp

@@ -14,6 +14,7 @@ ObjectSanNineLiner::ObjectSanNineLiner(const std::shared_ptr<DdsHandler> &ddsHan
                              const std::shared_ptr<DatabaseInterface> &db)
   : m_ddsHandler(ddsHandler)
   , m_db(db)
+  , m_logger(getLogger("ObjectSanNineLiner"))
 {
 }
 

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h

@@ -9,7 +9,7 @@
 #include "dds_handler.h"
 #include "logger.h"
 
-#include <Core/core_types.h>
+#include <DDS/Core/function_reply_object.h>
 
 // Generated
 #include <Evaluations/evl_db.h>
@@ -35,11 +35,12 @@ public:
   void onPublishData();
 protected:
 
-  NGL::INGLLogger &m_logger;
 private:
   std::shared_ptr<DdsHandler>            m_ddsHandler;
   std::shared_ptr<DatabaseInterface>     m_db;
   Database::SanNineLiner                 m_data;
   std::vector<Database::SanCategoryLine> m_lines;
+
+  NGL::INGLLogger            &m_logger;
 };
 }

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.cpp

@@ -6,10 +6,9 @@
   */
 
 #include "san_category_line_json.h"
-#include <utility>
 
-#include <QtCore/QJsonDocument>
-#include <QtCore/QDebug>
+#include <QJsonDocument>
+#include <QDebug>
 
 namespace Evaluations
 {
@@ -55,7 +54,7 @@ QVector<Database::SanCategoryLine> SanCategoryLine::fromJson(const std::string &
 QJsonDocument SanCategoryLine::toJson(std::vector<Database::SanCategoryLine> vecCategoryLines)
 {
   QJsonArray arr;
-  for (const Database::SanCategoryLine &cl : std::as_const(vecCategoryLines))
+  for (const Database::SanCategoryLine &cl : qAsConst(vecCategoryLines))
   {
     QJsonObject obj;
     obj[QStringLiteral("id")] = cl.id;

qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/san_category_line_json.h

@@ -3,7 +3,7 @@
 
 #include "logger.h"
 
-#include <QtCore/QJsonDocument>
+#include <QJsonDocument>
 #include <Evaluations/evl_db_structs.h>
 
 namespace Evaluations 
@@ -19,8 +19,7 @@ namespace Evaluations
     static QJsonDocument toJson(std::vector<Database::SanCategoryLine> vecCategoryLines);
 
   private:
-
-  NGL::INGLLogger &m_logger;
+    NGL::INGLLogger            &m_logger;
   };
 
 }

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

@@ -6,8 +6,8 @@
   */
 
 #pragma once
-#include <QtCore/QString>
-#include "svcevlserver_export.h"
+#include <QString>
+#include <Evaluations/evl_export.h>
 
 namespace NGL
 {