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
@@ -19,7 +19,7 @@ using namespace AlarmManagement;
|
||||
Initialization::Initialization()
|
||||
: m_logger(getLogger("Initialization"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Initialization::Initialization";
|
||||
INFO_LOG() << "Initialization::Initialization";
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -32,32 +32,32 @@ Initialization::~Initialization()
|
||||
m_dbHandler = nullptr;
|
||||
m_ddsHandler = nullptr;
|
||||
|
||||
INFO_LOG(m_logger) << "Initialization::~Initialization";
|
||||
INFO_LOG() << "Initialization::~Initialization";
|
||||
} // end of dtor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, const QSqlDatabase &sqlDb)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start AlarmManagement Initialization. domainId =" << ddsConnector->getDomainId()
|
||||
INFO_LOG() << "Start AlarmManagement Initialization. domainId =" << ddsConnector->getDomainId()
|
||||
<< " exerciseId=" << ddsConnector->getPartitionId();
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "m_ddsHandler initialized. ";
|
||||
INFO_LOG() << "m_ddsHandler initialized. ";
|
||||
|
||||
// initialize database
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "DbHandler initialized. ";
|
||||
INFO_LOG() << "DbHandler initialized. ";
|
||||
|
||||
|
||||
// create handlers
|
||||
@@ -65,7 +65,7 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
m_handlerConfigureAlarms = std::make_shared<HandlerConfigureAlarms>(this);
|
||||
m_handlerEmergencyCall = std::make_shared<HandlerEmergencyCall>(m_handlerConfigureAlarms, this);
|
||||
|
||||
DEBUG_LOG(m_logger) << "initialize successfully finished";
|
||||
DEBUG_LOG() << "initialize successfully finished";
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -76,20 +76,20 @@ bool Initialization::loadFromDatabase()
|
||||
// initialize handlers
|
||||
if (!m_handlerParticipant || !m_handlerParticipant->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize Participant handler";
|
||||
ERROR_LOG() << "Can not initialize Participant handler";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerConfigureAlarms || !m_handlerConfigureAlarms->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize Alarm handler";
|
||||
ERROR_LOG() << "Can not initialize Alarm handler";
|
||||
return false;
|
||||
}
|
||||
if (!m_handlerEmergencyCall || !m_handlerEmergencyCall->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not initialize EmergencyCall handler";
|
||||
ERROR_LOG() << "Can not initialize EmergencyCall handler";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "loadFromDatabase successfully finished";
|
||||
DEBUG_LOG() << "loadFromDatabase successfully finished";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user