Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/json_api.cpp

@@ -15,7 +15,6 @@ namespace Json
 Api::Api(QObject *parent)
   : QObject(parent)
   , m_webSocketHandler(new WebSocketHandler(this))
-  , m_logger(getLogger("Json.Api"))
 {
   connect(m_webSocketHandler, &WebSocketHandler::telegramReceived,
           this, &Api::onTelegramReceived);
@@ -66,7 +65,7 @@ void Api::sendHitResult(const HitResult &hitResult, const QMap <int, Contaminati
     tele.hitResult.contaminations += csi;
   }
 
-  DEBUG_LOG(m_logger) << LOGFUNCTION << ", tele = " << tele.toJson();
+  DEBUG_LOG() << Q_FUNC_INFO << ", tele = " << tele.toJson();
 
   m_webSocketHandler->sendTelegram(&tele, ws);
 }
@@ -142,7 +141,7 @@ void Api::sendEffectOverrides(const QString &segment,
 
 void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele)
 {
-  DEBUG_LOG(m_logger) << "tele->telegramId(): " << tele->telegramId();
+  DEBUG_LOG() << "tele->telegramId(): " << tele->telegramId();
 
   if (tele->telegramId() == Telegrams::SetDamageState::telegramId())
   {
@@ -272,7 +271,7 @@ void Api::onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tel
     emit getBsmTechnicalStatus(tel->sensorId);
     return;
   }
-  WARNING_LOG(m_logger) << "Received unhandled telegram " << tele->telegramId();
+  WARNING_LOG() << "Received unhandled telegram " << tele->telegramId();
 }
 
 

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

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <QObject>
-#include <Json/buildingcontroljson_export.h>
+#include "buildingcontroljson_export.h"
 #include <VWM/vwm_types.h>
 #include <BSM/bsm_types.h>
 #include <logger.h>
@@ -77,7 +77,6 @@ private Q_SLOTS:
   void onTelegramReceived(const std::shared_ptr<Telegrams::BaseTelegram> &tele);
 private:
   WebSocketHandler *m_webSocketHandler;
-  NGL::INGLLogger &m_logger;
 };
 } 
 } 

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/Json/web_socket_handler.cpp

@@ -14,7 +14,6 @@ namespace Json
 WebSocketHandler::WebSocketHandler(QObject *parent)
   : QObject(parent)
   , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this))
-  , m_logger(getLogger("Json.WebSocketHandler"))
 {}
 
 WebSocketHandler::~WebSocketHandler()
@@ -31,7 +30,7 @@ bool WebSocketHandler::init(quint16 listenPort)
 {
   if (!m_webSocketServer->listen(QHostAddress::Any, listenPort))
   {
-    WARNING_LOG(m_logger) << "Can not listen on port " << listenPort << " - aborting";
+    WARNING_LOG() << "Can not listen on port " << listenPort << " - aborting";
     return false;
   }
   
@@ -49,7 +48,7 @@ bool WebSocketHandler::sendTelegram(const Telegrams::BaseTelegram *tele, QWebSoc
     return false;
 
   const QString jsonStr = QString::fromUtf8(tele->toJson());
-  DEBUG_LOG(m_logger) << "jsonStr" << jsonStr;
+  DEBUG_LOG() << "jsonStr" << jsonStr;
 
   bool bOk = false;
   for (QWebSocket *ws : std::as_const(m_webSockets))
@@ -69,7 +68,7 @@ void WebSocketHandler::onNewConnection()
   QWebSocket *ws = m_webSocketServer->nextPendingConnection();
   if (!ws)
     return;
-  DEBUG_LOG(m_logger) << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
+  DEBUG_LOG() << "New websocket connection from " << ws->peerAddress().toString() << ":" << ws->peerPort();
 
   connect(ws, &QWebSocket::textMessageReceived,
           this, &WebSocketHandler::onTextMessageReceived);
@@ -83,11 +82,11 @@ void WebSocketHandler::onNewConnection()
 
 void WebSocketHandler::onTextMessageReceived(const QString &msg)
 {
-  DEBUG_LOG(m_logger) << "new text message: " << msg;
+  DEBUG_LOG() << "new text message: " << msg;
   auto tele = std::shared_ptr<Telegrams::BaseTelegram>(Telegrams::BaseTelegram::telegramFromJson(msg.toUtf8()));
   if (!tele)
   {
-    WARNING_LOG(m_logger) << "Error parsing incoming json data: '" << msg << "'";
+    WARNING_LOG() << "Error parsing incoming json data: '" << msg << "'";
     return;
   }
   emit telegramReceived(tele);

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

@@ -43,7 +43,6 @@ private Q_SLOTS:
 private:
   QWebSocketServer *m_webSocketServer;
   QSet<QWebSocket *> m_webSockets;
-  LOGGER_T m_logger;
 };
 
 }