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

@@ -58,7 +58,7 @@ Core::FunctionReplyObject ObjectChargeEffect::create(const ChargeEffectModifyReq
}
if (reply.error())
ERROR_LOG(m_logger) << reply.str();
ERROR_LOG() << reply.str();
if (reply.id() == 0)
reply.setId(m_data.id);
return reply;
@@ -96,7 +96,7 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
}
if (reply.error())
ERROR_LOG(m_logger) << reply.str();
ERROR_LOG() << reply.str();
return reply;
}
@@ -111,13 +111,13 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
void ObjectChargeEffect::updatedProperties(const Database::AesChargeEffect &dbData)
{
// update properties // "used": true/false
DEBUG_LOG(m_logger)<<" !!! update charge effect when not EsPrepared !!! ";
DEBUG_LOG()<<" !!! update charge effect when not EsPrepared !!! ";
const QString tmpProps = m_data.properties;
m_data.properties = dbData.properties; // update properties is allowed!!
if (!m_mainHandler->db()->update(m_data))
{
m_data.properties = tmpProps;
ERROR_LOG(m_logger)<<" Couldn't update charge effect when not EsPrepared!!!";
ERROR_LOG()<<" Couldn't update charge effect when not EsPrepared!!!";
}
}
@@ -127,14 +127,14 @@ bool ObjectChargeEffect::remove()
{
if (!m_mainHandler)
{
ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> No MainHandler present.";
ERROR_LOG() << "Not possible to remove ChargeEffect --> No MainHandler present.";
return false;
}
if (!m_mainHandler->dds()->dts()->removeChargeEffectByKey(m_data.id))
{
ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
ERROR_LOG() << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
return false;
}
@@ -198,14 +198,14 @@ void ObjectChargeEffect::publish()
{
if (!m_mainHandler)
{
ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
return;
}
if (!m_mainHandler->dds()->dts()->publish(dataBaseToDataTopic(m_data)))
{
ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
return;
}
@@ -295,7 +295,7 @@ void ObjectChargeEffect::setNextState()
if (oldState != m_state)
m_stateChanged = true;
DEBUG_LOG(m_logger) << "Switching from " << oldState << "to " << m_state;
DEBUG_LOG() << "Switching from " << oldState << "to " << m_state;
}
//-----------------------------------------------------------------------------
@@ -317,7 +317,7 @@ void ObjectChargeEffect::calculateInitEffectState()
if (oldState != m_state)
m_stateChanged = true;
DEBUG_LOG(m_logger) << "Setting init state: " << m_state;
DEBUG_LOG() << "Setting init state: " << m_state;
}
//-----------------------------------------------------------------------------
@@ -330,7 +330,7 @@ void ObjectChargeEffect::startStateTimer()
{
qint64 timeToActivatedMsecs = m_data.effectStart.toMSecsSinceEpoch() - QDateTime::currentMSecsSinceEpoch();
DEBUG_LOG(m_logger) << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
DEBUG_LOG() << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
m_stateTimer->start(timeToActivatedMsecs);
@@ -340,7 +340,7 @@ void ObjectChargeEffect::startStateTimer()
{
qint64 timeToExpiredMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration - QDateTime::currentMSecsSinceEpoch();
DEBUG_LOG(m_logger) << "Time to Expired [ms]: " << timeToExpiredMsecs;
DEBUG_LOG() << "Time to Expired [ms]: " << timeToExpiredMsecs;
m_stateTimer->start(timeToExpiredMsecs);
@@ -350,7 +350,7 @@ void ObjectChargeEffect::startStateTimer()
{
qint64 timeToFinishMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration + s_afterglowMsecs - QDateTime::currentMSecsSinceEpoch();
DEBUG_LOG(m_logger) << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
DEBUG_LOG() << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
m_stateTimer->start(timeToFinishMsecs);