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>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -31,7 +31,6 @@ MainHandler::MainHandler(QObject *parent)
, m_ddsHandler(nullptr)
, m_dbHandler(nullptr)
, m_handlerWebSocket(nullptr)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
@@ -53,29 +52,29 @@ bool MainHandler::init(int domainId)
if (!m_dbHandler->init(0, Settings::settings()))
{
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
ERROR_LOG() << "Initialisation dbHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
DEBUG_LOG() << "Initialisation dbHandler succesful.";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
if (!m_ddsHandler->init())
{
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
ERROR_LOG() << "Initialisation ddsHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
// read project specific data from database
// publish project specific data
// initialize all handlers
if (!initAsmHandler())
{
ERROR_LOG(m_logger) << "Initialisation AsmHandler failed.";
ERROR_LOG() << "Initialisation AsmHandler failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation AsmHandler succesful.";
DEBUG_LOG() << "Initialisation AsmHandler succesful.";
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
@@ -84,73 +83,73 @@ bool MainHandler::init(int domainId)
bool MainHandler::initAsmHandler()
{
DEBUG_LOG(m_logger) << "Start Initialisation AsmHandler";
DEBUG_LOG() << "Start Initialisation AsmHandler";
// TrainingArea
m_handlerTrainingArea = std::make_shared<HandlerTrainingArea>(this);
DEBUG_LOG(m_logger) << "Reset HandlerTrainingArea succesful.";
DEBUG_LOG() << "Reset HandlerTrainingArea succesful.";
if (!m_handlerTrainingArea->init())
{
ERROR_LOG(m_logger) << "Initialisation of HandlerTrainingArea failed.";
ERROR_LOG() << "Initialisation of HandlerTrainingArea failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation HandlerTrainingArea succesful.";
DEBUG_LOG() << "Initialisation HandlerTrainingArea succesful.";
// WorkstationLogout
m_handlerWorkstationLogout = std::make_shared<HandlerWorkstationLogout>(this);
DEBUG_LOG(m_logger) << "Reset HandlerWorkstationLogout succesful.";
DEBUG_LOG() << "Reset HandlerWorkstationLogout succesful.";
if (!m_handlerWorkstationLogout->init())
{
ERROR_LOG(m_logger) << "Initialisation of HandlerWorkstationLogout failed.";
ERROR_LOG() << "Initialisation of HandlerWorkstationLogout failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation HandlerWorkstationLogout succesful.";
DEBUG_LOG() << "Initialisation HandlerWorkstationLogout succesful.";
// Asset
m_handlerAsset = std::make_shared<HandlerAsset>(this);
DEBUG_LOG(m_logger) << "Reset HandlerAsset succesful.";
DEBUG_LOG() << "Reset HandlerAsset succesful.";
if (!m_handlerAsset->init())
{
ERROR_LOG(m_logger) << "Initialisation of HandlerAsset failed.";
ERROR_LOG() << "Initialisation of HandlerAsset failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation HandlerAsset succesful.";
DEBUG_LOG() << "Initialisation HandlerAsset succesful.";
// Location
m_handlerLocation = std::make_shared<HandlerLocation>(this);
DEBUG_LOG(m_logger) << "Reset HandlerLocation succesful.";
DEBUG_LOG() << "Reset HandlerLocation succesful.";
if (!m_handlerLocation->init())
{
ERROR_LOG(m_logger) << "Initialisation of HandlerLocation failed.";
ERROR_LOG() << "Initialisation of HandlerLocation failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation HandlerLocation succesful.";
DEBUG_LOG() << "Initialisation HandlerLocation succesful.";
// RelayInfo
m_handlerRelayInfo = std::make_shared<HandlerRelayInfo>(this);
DEBUG_LOG(m_logger) << "Reset HandlerRelayInfo succesful.";
DEBUG_LOG() << "Reset HandlerRelayInfo succesful.";
if (!m_handlerRelayInfo->init())
{
ERROR_LOG(m_logger) << "Initialisation of HandlerRelayInfo failed.";
ERROR_LOG() << "Initialisation of HandlerRelayInfo failed.";
return false;
}
DEBUG_LOG(m_logger) << "Initialisation HandlerRelayInfo succesful.";
DEBUG_LOG() << "Initialisation HandlerRelayInfo succesful.";
// WebSocketServer
m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler succesful.";
DEBUG_LOG() << "Reset WebSocketInterfaceHandler succesful.";
if (!m_handlerWebSocket->init())
{
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler succesful.";
return true;
}