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
@@ -14,29 +14,29 @@ namespace ComponentMonitor
|
||||
Initialization::Initialization()
|
||||
: m_logger(getLogger("Initialization"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
Initialization::~Initialization()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
m_checkmkHandler = nullptr;
|
||||
m_componentStatusHandler = nullptr;
|
||||
m_ddsHandler = nullptr;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
INFO_LOG() << Q_FUNC_INFO << " START";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
m_ddsHandler = ddsHandler;
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "ddsHandler referenced";
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "ddsHandler referenced";
|
||||
|
||||
|
||||
|
||||
@@ -73,10 +73,10 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
|
||||
if (!m_checkmkHandler->initialize(host, port, intervalSec))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " CheckmkHandler::initialize failed";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " CheckmkHandler::initialize failed";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " CheckmkHandler:initialize succesful";
|
||||
INFO_LOG() << Q_FUNC_INFO << " CheckmkHandler:initialize succesful";
|
||||
|
||||
QObject::connect(m_checkmkHandler.get(), &CheckmkHandler::newState,
|
||||
m_componentStatusHandler.get(), &ComponentStatusHandler::onNewState, Qt::UniqueConnection);
|
||||
@@ -88,10 +88,10 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
m_checkmkHandlerScheduleCheck = std::make_shared<CheckmkHandlerScheduleCheck>(m_ddsHandler);
|
||||
if (!m_checkmkHandlerScheduleCheck->initialize(host, port))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " CheckmkHandlerScheduleCheck::initialize failed";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck::initialize failed";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " CheckmkHandlerScheduleCheck:initialize succesful";
|
||||
INFO_LOG() << Q_FUNC_INFO << " CheckmkHandlerScheduleCheck:initialize succesful";
|
||||
|
||||
|
||||
#ifdef LTS_DEBUG
|
||||
@@ -110,21 +110,21 @@ bool Initialization::initialize(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
#endif
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
INFO_LOG() << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Initialization::delayedInit()
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
INFO_LOG() << Q_FUNC_INFO << " START";
|
||||
bool success = true;
|
||||
if (!m_componentStatusHandler->initialize(m_ddsHandler))
|
||||
{
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " initialize failed for ComponentStatusHandler";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " initialize failed for ComponentStatusHandler";
|
||||
success = false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " ComponentStatusHandler, statusMapSize=" << m_componentStatusHandler->getHostnames().size();
|
||||
INFO_LOG() << Q_FUNC_INFO << " ComponentStatusHandler, statusMapSize=" << m_componentStatusHandler->getHostnames().size();
|
||||
|
||||
m_checkmkHandler->run();
|
||||
|
||||
@@ -134,17 +134,17 @@ bool Initialization::delayedInit()
|
||||
|
||||
|
||||
const bool updateLastCheckTimeDirect = Settings::updateLastCheckTimeDirect();
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " updateLastCheckTimeDirect [bool] = " << updateLastCheckTimeDirect;
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " updateLastCheckTimeDirect [bool] = " << updateLastCheckTimeDirect;
|
||||
if (updateLastCheckTimeDirect)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " updateLastCheckTimeDirect is enabled";
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " updateLastCheckTimeDirect is enabled";
|
||||
QObject::connect(m_checkmkHandlerScheduleCheck.get(), &CheckmkHandlerScheduleCheck::updateLastCheckTimeDirect,
|
||||
m_componentStatusHandler.get(), &ComponentStatusHandler::onUpdateLastCheckTimeDirect, Qt::DirectConnection);
|
||||
}
|
||||
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
INFO_LOG() << Q_FUNC_INFO << " END";
|
||||
return success;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user