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

@@ -25,7 +25,6 @@ HandlerFiringExplosion::HandlerFiringExplosion(MainHandler *mainHandler,
: QObject(parent)
, ManuallyExplosionRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerFiringExplosion"))
{
}
@@ -77,8 +76,8 @@ void HandlerFiringExplosion::setFiringClearanceDuration()
//-----------------------------------------------------------------------------
void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escOrder)
{
DEBUG_LOG(m_logger) << "onStartHandlerFiring()";
DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
DEBUG_LOG() << "onStartHandlerFiring()";
DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
<< "shotsInTotal: " << escOrder.shotsPerVolley
<< "duration: " << escOrder.duration;
if (escOrder.numOfVolley < 0)
@@ -95,7 +94,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.numberOfShot(escOrder.shotsPerVolley);
m_firingExplosionEntity.remainingVolleys(escOrder.numOfVolley);
m_firingExplosionEntity.remainingShots(m_firingExplosionEntity.numberOfShot());
DEBUG_LOG(m_logger) << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
DEBUG_LOG() << "Changed number of Shots Remain: " << m_firingExplosionEntity.numberOfShot();
m_isNew = false;
}
m_firingExplosionEntity.duration(escOrder.duration * 1000);
@@ -104,7 +103,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.firingClearanceTime().set(escOrder.startTime);
else
{
WARNING_LOG(m_logger) << "reset clearance time";
WARNING_LOG() << "reset clearance time";
m_firingExplosionEntity.firingClearanceTime().reset();
}
@@ -112,7 +111,7 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
m_firingExplosionEntity.numberOfShot() <= 0 ||
m_firingExplosionEntity.numberOfVolley() <= 0)
{
WARNING_LOG(m_logger) << "Won't start Explosion ";
WARNING_LOG() << "Won't start Explosion ";
return;
}
@@ -124,8 +123,8 @@ void HandlerFiringExplosion::onStartHandlerFiring(const Database::EscOrder &escO
//-----------------------------------------------------------------------------
void HandlerFiringExplosion::onEndHandlerFiring(const Database::EscOrder &escOrder)
{
DEBUG_LOG(m_logger) << "onStopHandlerFiring()";
DEBUG_LOG(m_logger) << "numOfVolley: " << escOrder.numOfVolley
DEBUG_LOG() << "onStopHandlerFiring()";
DEBUG_LOG() << "numOfVolley: " << escOrder.numOfVolley
<< "shotsInTotal: " << escOrder.shotsPerVolley
<< "duration: " << escOrder.duration;
if (escOrder.numOfVolley < 0 || escOrder.idOrder != m_firingExplosionEntity.idOrder())
@@ -155,7 +154,7 @@ void HandlerFiringExplosion::onEffectShowStopped(qint16 idEffectShow)
{
if (idEffectShow != m_firingExplosionEntity.idEffectShow())
{
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
ERROR_LOG() << "EffectShow IDs not consistent: " << idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
return;
}
m_firingExplosionEntity.isActive(false);
@@ -165,7 +164,7 @@ void HandlerFiringExplosion::onEffectShowContinued(const ConvertFromTab::EffectS
{
if (effectShowContinue.idEffectShow != m_firingExplosionEntity.idEffectShow())
{
ERROR_LOG(m_logger) << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
ERROR_LOG() << "EffectShow IDs not consistent: " << effectShowContinue.idEffectShow << " / " << m_firingExplosionEntity.idEffectShow();
return;
}
}
@@ -207,7 +206,7 @@ void HandlerFiringExplosion::onStatusExplosionFiring(const StatusExplosionFiring
void HandlerFiringExplosion::onEffectShowStarted()
{
DEBUG_LOG(m_logger) << "onEffectShowStarted";
DEBUG_LOG() << "onEffectShowStarted";
m_mainHandler->handlerVehicle()->setExplosionParameter(m_firingExplosionEntity.remainingVolleys(),
m_firingExplosionEntity.remainingShots(),
m_firingExplosionEntity.remainingTime());
@@ -228,10 +227,10 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
if (!m_firingExplosionEntity.isActive() && m_isInterrupted == false)
{
DEBUG_LOG(m_logger) << "onEffectShowInterrupted is active so return";
DEBUG_LOG() << "onEffectShowInterrupted is active so return";
return false;
}
DEBUG_LOG(m_logger) << "onEffectShowInterrupted";
DEBUG_LOG() << "onEffectShowInterrupted";
m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN);
m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::StopTimer);
@@ -247,7 +246,7 @@ bool HandlerFiringExplosion::onEffectShowInterrupted()
void HandlerFiringExplosion::onManuallyExplosionRequest(const rti::core::SampleIdentity &cookie,
const ManuallyExplosionRequest &request)
{
DEBUG_LOG(m_logger) << "onManuallyExplosionRequest ";
DEBUG_LOG() << "onManuallyExplosionRequest ";
//override order!
if (m_firingExplosionEntity.idEffectShow() == 0)
{