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 HighLevelArchitecture
PpmHandler::PpmHandler(NgsHandler *ngsHandler)
: m_ngsHandler(ngsHandler)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("PpmHandler"))
{}
PpmHandler::~PpmHandler()
@@ -83,7 +82,7 @@ bool PpmHandler::init()
m_dtsTab->enableEquipmentGearAssignment())
)
{
ERROR_LOG(m_logger) << "Enabling TAB DTS Data-Topics failed.";
ERROR_LOG() << "Enabling TAB DTS Data-Topics failed.";
return false;
}
@@ -173,7 +172,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
int equipmentNo = getEquipmentNo(data.participantId());
if (equipmentNo == 0)
{
ERROR_LOG(m_logger) << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
ERROR_LOG() << "Could not find EquipmentNo for Participant " << data.participantId() << ". Cannot send Dynamic Participant Data Modification to HLA.";
return;
}
@@ -236,7 +235,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data;
DEBUG_LOG() << "onParticipantChanged: " << data;
switch (modType)
{
case DataModification::eAdded:
@@ -315,7 +314,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
{
DEBUG_LOG(m_logger) << "onParticipantPositionChanged: " << data;
DEBUG_LOG() << "onParticipantPositionChanged: " << data;
switch (modType)
{
case DataModification::eAdded:
@@ -405,7 +404,7 @@ void PpmHandler::onChargeTypeChanged(const ProjectDataManagement::ChargeType &da
void PpmHandler::startPublishToNgs()
{
INFO_LOG(m_logger) << "Recreating all players from scratch due to structure / exercise change";
INFO_LOG() << "Recreating all players from scratch due to structure / exercise change";
m_createdParticipantIds.clear();
@@ -414,7 +413,7 @@ void PpmHandler::startPublishToNgs()
INFO_LOG(m_logger) << "(Re)Adding all players, size: " << m_partData.size();
INFO_LOG() << "(Re)Adding all players, size: " << m_partData.size();
for (const ParticipantManagement::Participant &participant : std::as_const(m_partData))
createParticipant(participant);
@@ -475,7 +474,7 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromPercenta
void PpmHandler::participantVulnerabilityStateRequest(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateChange &request)
{
DEBUG_LOG(m_logger) << "Participant Vulnerability State Request";
DEBUG_LOG() << "Participant Vulnerability State Request";
rpr2::DetonationResultCodeEnum8::ET resCode = rpr2DetonationResultFromVulnerabilityState(request.reqestedState);
m_ngsHandler->ngsConnector()->sendMunitionDetonation(request.header.equipmentNumber,
@@ -504,7 +503,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
if (!m_ngsHandler->ngsConnector()->canPublishData())
{
WARNING_LOG(m_logger) << "Can not publish data ... :(";
WARNING_LOG() << "Can not publish data ... :(";
return;
}