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

@@ -24,7 +24,6 @@ ObjectIed::ObjectIed(const std::shared_ptr<DdsHandler> &ddsHandler,
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_ppmDtc(ppmDtc)
, m_logger(getLogger("ObjectIed"))
{
}
@@ -44,10 +43,10 @@ Core::FunctionReplyObject ObjectIed::createObject(const Database::GimIed &data)
}
// Id is serial -> will be generated by db => inside m_data after db-insert
DEBUG_LOG(m_logger) << "New IED-Id: " << m_data.id;
DEBUG_LOG() << "New IED-Id: " << m_data.id;
}
INFO_LOG(m_logger) << "Ied created sucessfully.";
INFO_LOG() << "Ied created sucessfully.";
// Publish Data via DTS
onPublishData();
@@ -164,10 +163,10 @@ void ObjectIed::onPublishData()
ddsData.symbol(m_data.symbol.toStdString());
ddsData.sampleTime(m_data.sampleTime);
INFO_LOG(m_logger) << "Publish IED-data to dds (" << m_data.id << ") ...";
INFO_LOG() << "Publish IED-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG(m_logger) << "Error publishing IED-data to dds";
ERROR_LOG() << "Error publishing IED-data to dds";
}
void ObjectIed::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
@@ -220,15 +219,15 @@ Core::FunctionReplyObject ObjectIed::updateObject()
if (!isValid())
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed IED object"));
INFO_LOG(m_logger) << "Trying to updateObject IedData with id = " << m_data.id;
INFO_LOG() << "Trying to updateObject IedData with id = " << m_data.id;
if (!m_db->update(m_data))
{
ERROR_LOG(m_logger) << "Failed to update IedData with id = " << m_data.id;
ERROR_LOG() << "Failed to update IedData with id = " << m_data.id;
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating IED-data with id %1 in database")).arg(m_data.id);
}
INFO_LOG(m_logger) << "IED-Data changed sucessfully.";
INFO_LOG() << "IED-Data changed sucessfully.";
// Publish Data via DTS
onPublishData();
@@ -239,7 +238,7 @@ Core::FunctionReplyObject ObjectIed::updateObject()
void ObjectIed::publishPosition()
{
if (!m_ddsHandler->dts()->publish(m_position))
ERROR_LOG(m_logger) << "Error publishing IED-position to dds";
ERROR_LOG() << "Error publishing IED-position to dds";
}
bool ObjectIed::isValid() const