Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules

Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/CMakeLists.txt

@@ -14,6 +14,14 @@ else()
 endif()
 
 
+# <logger.h> from the subdirectories (BSM, Json, VWM, ControlEffects) must
+# resolve to this directory's logger.h (namespace BuildingControlUnit), as in
+# the qt5 build. The root CMakeLists puts Lts/Proxies/TrainingAreaBase on the
+# global include path, which would otherwise shadow it with
+# TrainingAreaBase/logger.h (whose svctabcommon_export.h lives only in the
+# build tree), breaking these targets.
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
+
 ADD_SUBDIRECTORY(BSM)
 if(BUILDINGCONTROLJSON_AVAILABLE)
   ADD_SUBDIRECTORY(Json)

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp

@@ -12,7 +12,7 @@ namespace BuildingControlUnit
 
 XmlReader::XmlReader(QObject *parent)
   : QObject(parent)
-  .getNGLLogger("XmlReader"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("XmlReader"))
 {
 }
 
@@ -188,7 +188,7 @@ Action *XmlReader::parseAction(QXmlStreamReader &xml)
   if (xml.name() == QStringLiteral("bsm"))
     return parseBsmAction(xml);
 
-  WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled.";
+  WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().toString() << "'cannot be handled.";
   return {};
 }
 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/main_handler.h

@@ -37,7 +37,6 @@ private Q_SLOTS:
   void onSwitchRelayRequest(const QString &hostname, const SwitchRelayValues &switchRelayValues);
   void webSocketSendInitialData(QWebSocket *ws);
 private:
-  NGL::INGLLogger &m_logger;
   QVector<int> getAffectedRoomIds(const QVector<HitRoom> &allHitRooms) const;
   QVector<int> getSegmentDamage(const QVector<HitRoom> &allHitRooms, const int damagePercentNew) const;
   int getHitRoomId(const QVector<HitRoom> &allHitRooms) const;