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

@@ -17,7 +17,6 @@ FiringExplosion::FiringExplosion(QWidget *parent)
, m_session(nullptr)
, m_safetyConfirmationWidget(nullptr)
, m_ui(new Ui::FiringExplosion)
, m_logger(getLogger("FiringExplosion"))
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_idOrder(0)
, m_idEffectShow(0)
@@ -58,11 +57,11 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
const std::shared_ptr<EffectShowClient::Interface::Ftc> &ftc,
LtsSession::LtsSession *session, bool freeForm)
{
DEBUG_LOG(m_logger) << "FiringExplosion::init()";
DEBUG_LOG() << "FiringExplosion::init()";
if (!dtc || !ftc)
{
ERROR_LOG(m_logger) << "FiringExplosion::init() Invalid shared_ptr!";
ERROR_LOG() << "FiringExplosion::init() Invalid shared_ptr!";
return false;
}
@@ -73,7 +72,7 @@ bool FiringExplosion::init(const std::shared_ptr<EffectShowClient::Interface::Dt
m_safetyConfirmationWidget = new SafetyConfirmationWidget(this);
if (!m_safetyConfirmationWidget->init(m_ftc))
{
ERROR_LOG(m_logger) << "Can't create SafetiConfirmationWidget";
ERROR_LOG() << "Can't create SafetiConfirmationWidget";
return false;
}
m_ui->mainVertLayout->insertWidget(3, m_safetyConfirmationWidget);
@@ -181,7 +180,7 @@ void FiringExplosion::onOperatingConditionEntityChanged(const OperatingCondition
void FiringExplosion::onApply()
{
if (!statusChangedForManuallyEffectShow(EffectShowStatus_e::Apply))
ERROR_LOG(m_logger) << "Apply failed";
ERROR_LOG() << "Apply failed";
}
void FiringExplosion::onFire()
@@ -193,7 +192,7 @@ void FiringExplosion::onFire()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Fire);
if (!rc)
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
ERROR_LOG() << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onInterrupt()
{
@@ -204,7 +203,7 @@ void FiringExplosion::onInterrupt()
rc = statusChangedForManuallyEffectShow(EffectShowStatus_e::Interrupt);
if (!rc)
ERROR_LOG(m_logger) << "Firing Explosion Order Execution failed";
ERROR_LOG() << "Firing Explosion Order Execution failed";
}
void FiringExplosion::onAbort()
@@ -329,7 +328,7 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu
oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution;
break;
default:
DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
DEBUG_LOG() << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, should not happen I guess...";
break;
}
orderModifyRequest.orderConfirmation(oc);