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

@@ -13,7 +13,7 @@
#include "logger.h"
#include <AudioVideoManagement/avm_dts.h>
#include <AudioVideoManagement/avm_db.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include <ngldb/dbtransaction.h>
#include <vector>
#include <set>
@@ -78,7 +78,6 @@ namespace AudioVideoManagement
ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db)
: m_dts(dts)
, m_db(db)
, m_logger(getLogger("ObjectMenuStruct"))
{
Q_ASSERT(dts);
Q_ASSERT(db);
@@ -128,10 +127,10 @@ Core::FunctionReplyObject ObjectMenuStruct::remove()
{
DBTransaction trans(m_db->database());
INFO_LOG(m_logger) << "menuEntries.size(): " << m_data.menuEntries().size();
INFO_LOG() << "menuEntries.size(): " << m_data.menuEntries().size();
for (const AudioVideoManagement::AvMenuEntry &me : m_data.menuEntries())
{
INFO_LOG(m_logger) << "Remove entries with id/parentId: " << me.id();
INFO_LOG() << "Remove entries with id/parentId: " << me.id();
// no recursion needed, only 2 levels allowed
if (me.isGroup())
if (!m_db->removeAvmMenuStructByParentId(me.id()))
@@ -152,10 +151,10 @@ Core::FunctionReplyObject ObjectMenuStruct::remove()
void ObjectMenuStruct::onPublishData()
{
INFO_LOG(m_logger) << "Publish MenuStruct-data to dds (" << m_data.id() << ") ...";
INFO_LOG() << "Publish MenuStruct-data to dds (" << m_data.id() << ") ...";
if (!m_dts->publish(m_data))
ERROR_LOG(m_logger) << "Error publishing MenuStruct-data to dds";
ERROR_LOG() << "Error publishing MenuStruct-data to dds";
}
@@ -199,7 +198,7 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat
if (ret.error())
return ret;
DEBUG_LOG(m_logger) << "old entries: " << m_data;
DEBUG_LOG() << "old entries: " << m_data;
for (const AvMenuEntry &me : oldEntries)
{
// new entries - ignore
@@ -209,14 +208,14 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat
auto found = std::find_if(newEntries.begin(), newEntries.end(), [&me] (const AvMenuEntry &newEntry) { return me.id() == newEntry.id(); });
if (found == newEntries.end())
{
DEBUG_LOG(m_logger) << "Menu Entry with id not found - was removed: " << me.id();
DEBUG_LOG() << "Menu Entry with id not found - was removed: " << me.id();
m_db->removeAvmMenuStruct(me.id());
}
}
m_data.menuEntries(newEntries);
HandlerMenuStruct::sortEntries(m_data);
DEBUG_LOG(m_logger) << "new entries: " << m_data;
DEBUG_LOG() << "new entries: " << m_data;
trans.commit();
return Core::FunctionReplyObject(m_data.id());