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

@@ -18,14 +18,13 @@ HandlerPpmData::HandlerPpmData(Initialization *mainHandler,
QObject *parent)
: QObject(parent)
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerPpmData"))
{
} // end of ctor()
//=============================================================================
bool HandlerPpmData::init()
{
DEBUG_LOG(m_logger) << "Begin HandlerPpmData";
DEBUG_LOG() << "Begin HandlerPpmData";
auto dtcPpm = m_mainHandler->dds()->dtcPpm();
connect(dtcPpm.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
this, &HandlerPpmData::onParticipantChanged);
@@ -41,7 +40,7 @@ bool HandlerPpmData::init()
return false;
}
DEBUG_LOG(m_logger) << "End HandlerPpmData";
DEBUG_LOG() << "End HandlerPpmData";
return true;
} // end of init()
@@ -54,7 +53,7 @@ HandlerPpmData::Participant_t HandlerPpmData::getIdAndNameOfEffectShowActor(int
return p;
}
WARNING_LOG(m_logger) << LOGFUNCTION << " Equipment Number not found: " << equipmentNum;
WARNING_LOG() << Q_FUNC_INFO << " Equipment Number not found: " << equipmentNum;
return Participant_t(); // participant not available
} // end of getIdAndNameOfEffectShowActor()
@@ -65,7 +64,7 @@ int HandlerPpmData::getEquipmentNumber(int id) const
auto it = m_participant.find(id);
if (it == m_participant.end())
{
WARNING_LOG(m_logger) << LOGFUNCTION << " Participant(" << id << ") not found. ";
WARNING_LOG() << Q_FUNC_INFO << " Participant(" << id << ") not found. ";
return -1; // participant not available
}
return it.value().equipmentNumber;
@@ -79,7 +78,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
{
auto m_ppmDtc = m_mainHandler->dds()->dtcPpm();
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(data.typeId()).typeClass();
DEBUG_LOG(m_logger) << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
DEBUG_LOG() << "support entity / equipment number set " << (typeClass == ParticipantManagement::TypeClass::SupportEntity)
<< " / " << data.equipmentNumber().is_set() << ", typeId: " << data.typeId()
<< ", cnt: " << m_ppmDtc->types().size();
@@ -120,7 +119,7 @@ void HandlerPpmData::onParticipantChanged(const ParticipantManagement::Participa
}
}
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id() << ' ' << data.name() << ' ' << modType;
DEBUG_LOG() << "onParticipantChanged: " << data.id() << ' ' << data.name() << ' ' << modType;
} // end of onParticipantChanged()