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
+7
-8
@@ -30,7 +30,6 @@ MainHandler::MainHandler()
|
||||
, m_mrkService(nullptr)
|
||||
, m_evlService(nullptr)
|
||||
, m_removeTimer(new QTimer(this))
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{
|
||||
connect(m_removeTimer, &QTimer::timeout, this, &MainHandler::onRemoveKeys);
|
||||
m_removeTimer->setInterval(5000);
|
||||
@@ -65,12 +64,12 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
bool bRet = initInternal(domainId, exerciseId);
|
||||
if (bRet)
|
||||
{
|
||||
INFO_LOG(m_logger) << "svcExerciseEventManagement successfully initialized";
|
||||
INFO_LOG() << "svcExerciseEventManagement successfully initialized";
|
||||
m_ddsHandler->setRunningState(Core::RunningState::Running);
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing svcExerciseEventManagement...";
|
||||
ERROR_LOG() << "Error initializing svcExerciseEventManagement...";
|
||||
if (m_ddsHandler)
|
||||
m_ddsHandler->setRunningState(Core::RunningState::StartingError);
|
||||
}
|
||||
@@ -144,27 +143,27 @@ bool MainHandler::loadFromDatabase()
|
||||
{
|
||||
if (!m_webSocketEventServer || !m_webSocketEventServer->listen(Settings::getWebSocketServerPortRange(1)))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize WebSocket Event server";
|
||||
ERROR_LOG() << "Can not initialize WebSocket Event server";
|
||||
return false;
|
||||
}
|
||||
m_ddsHandler->addPortToPacemaker(m_webSocketEventServer->listenPort(), Core::PortType::WebSocketServer);
|
||||
|
||||
if (!m_handlerEerEvent || !m_handlerEerEvent->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize EquipmentErrorRegistration handler";
|
||||
ERROR_LOG() << "Can not initialize EquipmentErrorRegistration handler";
|
||||
return false;
|
||||
}
|
||||
if (!m_dynPartData || !m_dynPartData->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize Participant Data handler";
|
||||
ERROR_LOG() << "Can not initialize Participant Data handler";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerPartEvent || !m_handlerPartEvent->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize Participant Event handler";
|
||||
ERROR_LOG() << "Can not initialize Participant Event handler";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "loadFromDatabase successfully finished";
|
||||
DEBUG_LOG() << "loadFromDatabase successfully finished";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user