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

@@ -16,7 +16,6 @@ namespace GuezNasat
{
HandlerNasatNineLiner::HandlerNasatNineLiner(Initialization *mainHandler)
: m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerNasatNineLiner"))
{}
bool HandlerNasatNineLiner::init() const
@@ -26,7 +25,7 @@ bool HandlerNasatNineLiner::init() const
connect(m_mainHandler->handlerParticipant().get(), &HandlerParticipant::nasatAircraftParticipantRemoved,
this, &HandlerNasatNineLiner::onNasatAircraftParticipantRemoved, Qt::DirectConnection);
DEBUG_LOG(m_logger) << "HandlerNasatNineLiner init done";
DEBUG_LOG() << "HandlerNasatNineLiner init done";
return true;
@@ -109,18 +108,18 @@ static Nasat9Liner createDds9Liner(const NasatNineLiner &nasatNineLiner)
void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLiner)
{
DEBUG_LOG(m_logger) << "nineLinerReceived, aircraftId=" << nasatNineLiner.aircraftId
DEBUG_LOG() << "nineLinerReceived, aircraftId=" << nasatNineLiner.aircraftId
<< " - nasatNineLiner.aircraftId is aka nasatId";
const auto participants = m_mainHandler->handlerParticipant()->participantsForNasatId(nasatNineLiner.aircraftId);
if (participants.isEmpty())
{
INFO_LOG(m_logger) << "No exercise participants found to publish 9-liner for nasat aircraft with id "
INFO_LOG() << "No exercise participants found to publish 9-liner for nasat aircraft with id "
<< nasatNineLiner.aircraftId;
return;
}
DEBUG_LOG(m_logger) << "nineLinerReceived, publishing to exercises";
DEBUG_LOG() << "nineLinerReceived, publishing to exercises";
static int s_id = 1;
Nasat9Liner nl = createDds9Liner(nasatNineLiner);
@@ -130,7 +129,7 @@ void HandlerNasatNineLiner::nineLinerReceived(const NasatNineLiner &nasatNineLin
const auto &exerciseParticipantId = it.key();
auto nape = it.value();
DEBUG_LOG(m_logger) << "nineLinerReceived, publishing to exercises, s_id=" << s_id
DEBUG_LOG() << "nineLinerReceived, publishing to exercises, s_id=" << s_id
<< ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
<< ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
@@ -172,17 +171,17 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
const int nasatId = m_mainHandler->nasatAircraft()->nasatIdFromNasatAircraftId(nap.nasatAircraftId());
INFO_LOG(m_logger) << " onNasatAircraftParticipantRemoved, nap = " << nap << ", nasatId = " << nasatId;
INFO_LOG() << " onNasatAircraftParticipantRemoved, nap = " << nap << ", nasatId = " << nasatId;
if (nasatId < 0)
{
WARNING_LOG(m_logger) << " nasatIdFromNasatAircraftId failed, nap=" << nap;
WARNING_LOG() << " nasatIdFromNasatAircraftId failed, nap=" << nap;
return;
}
const auto participants = m_mainHandler->handlerParticipant()->participantsForNasatId(nasatId);
if (participants.isEmpty())
{
INFO_LOG(m_logger) << "No exercise participants found to publish 9-liner for nasat aircraft with id "
INFO_LOG() << "No exercise participants found to publish 9-liner for nasat aircraft with id "
<< nap.nasatAircraftId();
return;
}
@@ -193,7 +192,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
auto nape = it.value();
auto &nineLinerParticipant = m_nineLiner[exerciseParticipantId];
DEBUG_LOG(m_logger) << LOGFUNCTION << " updating for removing "
DEBUG_LOG() << Q_FUNC_INFO << " updating for removing "
<< ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
<< ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId
<< ", nineLinerParticipant.isEmpty()=" << nineLinerParticipant.isEmpty();
@@ -203,7 +202,7 @@ void HandlerNasatNineLiner::onNasatAircraftParticipantRemoved(const NasatAircraf
auto &oldLast = nineLinerParticipant.last();
if (oldLast.isCurrent())
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " updating for removing "
DEBUG_LOG() << Q_FUNC_INFO << " updating for removing "
<< ", exerciseParticipantId.exerciseId=" << exerciseParticipantId.exerciseId
<< ", exerciseParticipantId.participantId=" << exerciseParticipantId.participantId;
oldLast.sampleTime(QDateTime::currentMSecsSinceEpoch());