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

@@ -35,7 +35,6 @@ HandlerIed::HandlerIed(MainHandler *mainHandler,
, m_tabDtc(nullptr)
, m_ppmDtc(nullptr)
, m_db(db)
, m_logger(getLogger("HandlerIed"))
{}
HandlerIed::~HandlerIed()
@@ -53,17 +52,17 @@ bool HandlerIed::init()
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
if (!m_ppmDtc->enableParticipantPosition())
{
ERROR_LOG(m_logger) << "PPM DTC enableParticipantPosition() failed.";
ERROR_LOG() << "PPM DTC enableParticipantPosition() failed.";
return false;
}
if (!m_ppmDtc->enableParticipant())
{
ERROR_LOG(m_logger) << "PPM DTC enableParticipant() failed.";
ERROR_LOG() << "PPM DTC enableParticipant() failed.";
return false;
}
if (!m_ppmDtc->enableParty())
{
ERROR_LOG(m_logger) << "PPM DTC enableParty() failed.";
ERROR_LOG() << "PPM DTC enableParty() failed.";
return false;
}
@@ -71,7 +70,7 @@ bool HandlerIed::init()
// read all Ieds from database
if (!m_db->select(dataVec))
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -83,13 +82,13 @@ bool HandlerIed::init()
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
return false;
}
m_iedObjMap.insert(ifs->getId(), ifs);
}
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_iedObjMap.size();
DEBUG_LOG() << "m_exeObjMap.size() = " << m_iedObjMap.size();
// Initialize RecordReplay to get initial IedPosition
RecordReplayPlugin recordReplay;
@@ -102,7 +101,7 @@ bool HandlerIed::init()
// key is sampleTime -> multiMap
QMultiMap<qint64, GuezIedManagement::IedPosition> latestPositions = recordReplay.getIedPositionMap();
DEBUG_LOG(m_logger) << "Starting to read IED positions from record replay. Size: "
DEBUG_LOG() << "Starting to read IED positions from record replay. Size: "
<< latestPositions.size();
for (auto it = latestPositions.begin(); it != latestPositions.end(); ++it)
@@ -112,10 +111,10 @@ bool HandlerIed::init()
if (currentIed == nullptr)
{
INFO_LOG(m_logger) << "Got position for non existing IED-Id: " << pos.id();
INFO_LOG() << "Got position for non existing IED-Id: " << pos.id();
continue;
}
DEBUG_LOG(m_logger) << "Setting position for IED-Id " << pos.id();
DEBUG_LOG() << "Setting position for IED-Id " << pos.id();
currentIed->setPosition(it.value());
}
@@ -124,7 +123,7 @@ bool HandlerIed::init()
if (!m_tabDtc->enableDefinitionIed() ||
!m_tabDtc->enableStateIed())
{
ERROR_LOG(m_logger) << "Could not initialize TraininAreaBase data topic client";
ERROR_LOG() << "Could not initialize TraininAreaBase data topic client";
return false;
}
@@ -178,7 +177,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
if (modType != DataModification::eAdded && modType != DataModification::eModified)
return;
DEBUG_LOG(m_logger) << "onDefinitionIed: " << data;
DEBUG_LOG() << "onDefinitionIed: " << data;
Database::GimIed newData;
@@ -238,7 +237,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
return;
}
m_iedObjMap.insert(ifs->getId(), ifs);
@@ -277,7 +276,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
if (modType != DataModification::eAdded && modType != DataModification::eModified)
return;
DEBUG_LOG(m_logger) << "onStateIed: " << data;
DEBUG_LOG() << "onStateIed: " << data;
// only overwrite state for existing IEDs
if (m_iedObjMap.contains(getIdByEquipmentnumber(data.iedId())))
@@ -295,7 +294,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
}
else
{
WARNING_LOG(m_logger) << "StateIed without an existing IED - got no DefinitionIED? " << data;
WARNING_LOG() << "StateIed without an existing IED - got no DefinitionIED? " << data;
m_orphanedStateIed.insert(data.iedId(), data);
}
}
@@ -305,7 +304,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
{
Core::FunctionReplyObject ret;
INFO_LOG(m_logger) << "onPairIedRequest id = " << request.id();
INFO_LOG() << "onPairIedRequest id = " << request.id();
ObjectIed *ifs = m_iedObjMap.value(request.id());
if (ifs == nullptr)
@@ -337,7 +336,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
ret = ifs->updatePairingState(data);
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
m_ddsHandler->fts()->pairIedReply(cookie, ret);
}