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:
2785 files changed
+18754
-18316
No files matched your search
+11
-11
@@ -48,14 +48,14 @@ MainHandler::~MainHandler()
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
bool MainHandler::init(int domainId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "--- Start InfrastructureManagement MainHandler.";
|
||||
INFO_LOG() << "--- Start InfrastructureManagement MainHandler.";
|
||||
|
||||
// initialize DDS
|
||||
// for InfrastructureManagement => exerciseId = partitionId
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
if (m_ddsHandler->pacemaker())
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
@@ -66,7 +66,7 @@ bool MainHandler::init(int domainId)
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(0, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
pm->setNewState(Core::RunningState::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -79,7 +79,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerMainStructureElement = std::make_shared<HandlerMainStructureElement>(this);
|
||||
if (!m_handlerMainStructureElement->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerMainStructureElement failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerMainStructureElement failed.";
|
||||
pm->setNewState(Core::RunningState::StoppedError);
|
||||
return false;
|
||||
}
|
||||
@@ -89,7 +89,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerInstrumentationAsset = std::make_shared<HandlerInstrumentationAsset>(this);
|
||||
if (!m_handlerInstrumentationAsset->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerInstrumentationAsset failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerInstrumentationAsset failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -98,7 +98,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerMountingPointAsset = std::make_shared<HandlerMountingPointAsset>(this);
|
||||
if (!m_handlerMountingPointAsset->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerMountingPointAsset failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerMountingPointAsset failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -108,7 +108,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerEffectArea = std::make_shared<HandlerEffectArea>(this);
|
||||
if (!m_handlerEffectArea->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerEffectArea failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerEffectArea failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerSpecialArea = std::make_shared<HandlerSpecialArea>(this);
|
||||
if (!m_handlerSpecialArea->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerSpecialArea failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerSpecialArea failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -126,7 +126,7 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerMainSchedule = std::make_shared<HandlerMainSchedule>(this);
|
||||
if (!m_handlerMainSchedule->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerMainSchedule failed.";
|
||||
ERROR_LOG() << "Initialisation HandlerMainSchedule failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
@@ -141,12 +141,12 @@ bool MainHandler::init(int domainId)
|
||||
m_handlerWebSocketInterface = std::make_shared<WebSocketInterfaceHandler>(this);
|
||||
if (!m_handlerWebSocketInterface->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterface failed.";
|
||||
ERROR_LOG() << "Initialisation WebSocketInterface failed.";
|
||||
pm->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "ISM MainHandler initialized.";
|
||||
INFO_LOG() << "ISM MainHandler initialized.";
|
||||
pm->setNewState(Core::RunningState::Running);
|
||||
pm->addPort(m_handlerWebSocketInterface->webSocketPort(), Core::PortType::WebSocketServer);
|
||||
|
||||
|
||||
Reference in new issue
Block a user