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

@@ -98,7 +98,7 @@ public:
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(config);
if (!m_db->insert(deviceConfig))
ERROR_LOG(m_logger) << "Error while inserting device config into database";
ERROR_LOG() << "Error while inserting device config into database";
m_cache.insert(config.id(), deviceConfig);
emit m_handler->avDbReloadNeeded();
@@ -114,7 +114,7 @@ public:
deviceConfig.id = oldDeviceConfig.id;
if (!m_db->update(deviceConfig))
ERROR_LOG(m_logger) << "Error while updating device config";
ERROR_LOG() << "Error while updating device config";
m_cache[config.id()] = deviceConfig;
emit m_handler->avDbReloadNeeded();
@@ -140,7 +140,7 @@ public:
Q_ASSERT(found != m_cache.end());
if (!m_db->removeAvmDeviceConfig(found->id))
ERROR_LOG(m_logger) << "Error while removing device config";
ERROR_LOG() << "Error while removing device config";
m_cache.erase(found);
emit m_handler->avDbReloadNeeded();
@@ -156,7 +156,6 @@ private:
TvcHandler *m_handler;
DatabaseInterface *m_db;
QMap<int32_t, Database::AvmDeviceConfig> m_cache; // <TvcConfig::id, Database::DeviceConfig>
LOGGER_T m_logger;
};
@@ -167,7 +166,6 @@ TvcHandler::TvcHandler(Interface::Dts *dts, Interface::Fts *fts, DatabaseInterfa
, m_fts(fts)
, m_db(db)
, m_activeExercises(activeExercises)
, m_logger(getLogger("TrainingVoiceCommunicationHandler"))
, m_deviceConfig(new DeviceConfig(this, m_db, m_logger))
{
Q_ASSERT(dts);
@@ -198,7 +196,7 @@ bool TvcHandler::init()
if (!m_db->select(m_channels))
{
ERROR_LOG(m_logger) << "Error while selecting tetra channels from db";
ERROR_LOG() << "Error while selecting tetra channels from db";
return false;
}
@@ -209,7 +207,7 @@ bool TvcHandler::init()
if (!m_db->select(tvcConfigs))
{
ERROR_LOG(m_logger) << "Error while selecting TVC configs from db";
ERROR_LOG() << "Error while selecting TVC configs from db";
return false;
}
@@ -234,23 +232,23 @@ const TvcConfig &TvcHandler::config(int32_t id) const
void TvcHandler::onModifyTvcConfigRequest(const rti::core::SampleIdentity &cookie,
const ModifyTvcConfigRequest &request)
{
DEBUG_LOG(m_logger) << "onModifyTvcConfigRequest: " << request;
DEBUG_LOG() << "onModifyTvcConfigRequest: " << request;
Q_ASSERT(request.id() >= 0);
auto ret = request.id() > 0 ? modifyTvcConfig(request) : createTvcConfig(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_fts->modifyTvcConfigReply(cookie, ret);
}
void TvcHandler::onRemoveTvcConfigRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "onRemoveTvcConfigRequest" << request;
DEBUG_LOG() << "onRemoveTvcConfigRequest" << request;
Core::FunctionReplyObject rep = removeTvcConfig(request);
if (rep.error())
WARNING_LOG(m_logger) << rep.translated();
WARNING_LOG() << rep.translated();
m_fts->removeTvcConfigReply(cookie, rep);
}
@@ -483,7 +481,7 @@ void TvcHandler::onDbDeleteAvmTvcConfig(const QVariant &id)
if (!m_cache.contains(configId))
return; // the notification was a result of our own removal of the entry
DEBUG_LOG(m_logger) << "DB deleted AvmTvcConfig with id: " << configId;
DEBUG_LOG() << "DB deleted AvmTvcConfig with id: " << configId;
removeTvcConfig(Core::RemoveElementRequest(configId));
}