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

@@ -15,7 +15,6 @@ ObjectCodificationData::ObjectCodificationData(const std::shared_ptr<DdsHandler>
const std::shared_ptr<DbHandler> &dbHandler)
: m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler)
, m_logger(getLogger("ObjectCodificationData"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -28,7 +27,7 @@ ObjectCodificationData::~ObjectCodificationData()
Core::FunctionReplyObject ObjectCodificationData::createObject(const CodificationData &ddsData)
{
DEBUG_LOG(m_logger) << "ObjectCodificationData::createObject()";
DEBUG_LOG() << "ObjectCodificationData::createObject()";
m_ddsData = ddsData;
if (m_ddsData.id() <= 0)
@@ -42,7 +41,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting codification_table data into database"));
m_ddsData.id(dbData.id);
DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id();
DEBUG_LOG() << "New codificationTable id: " << m_ddsData.id();
}
// Publish Data via DTS
@@ -54,7 +53,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
Core::FunctionReplyObject ObjectCodificationData::updateObject(const CodificationManagement::CodificationData &ddsData)
{
DEBUG_LOG(m_logger) << "ObjectCodificationData::updateObject()";
DEBUG_LOG() << "ObjectCodificationData::updateObject()";
if (!isValid())
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Object not valid/blocked"));
@@ -67,7 +66,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Error updating codification_table data in database"));
// update internal objectdata
m_ddsData = ddsData;
DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id();
DEBUG_LOG() << "Data changed for codification_table id: " << m_ddsData.id();
// Publish Data via DTS
onPublishData();
@@ -79,7 +78,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
Core::FunctionReplyObject ObjectCodificationData::removeObject()
{
DEBUG_LOG(m_logger) << "ObjectCodificationData::removeObject()";
DEBUG_LOG() << "ObjectCodificationData::removeObject()";
if (isUsed())
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table data still in use"));
@@ -87,7 +86,7 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id()))
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id());
DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id();
DEBUG_LOG() << "Removed codification_table id " << m_ddsData.id();
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
return Core::FunctionReplyObject(m_ddsData.id());
@@ -96,10 +95,10 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
void ObjectCodificationData::onPublishData()
{
INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
INFO_LOG() << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
if (!m_ddsHandler->dts()->publish(m_ddsData))
ERROR_LOG(m_logger) << "Error publishing CodificationData data to dds";
ERROR_LOG() << "Error publishing CodificationData data to dds";
} // end of onPublishData()
//-----------------------------------------------------------------------------