lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/central_aes_byte_reader.cpp
+10 -11
View File
@@ -18,7 +18,6 @@ namespace OcSituationClient
CentralAesByteReader::CentralAesByteReader(const QByteArray &data)
: m_data(data)
, m_logger(getLogger("CentralAesByteReader"))
{}
bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::RemoveMessage &removeMessage) const
@@ -26,7 +25,7 @@ bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::R
bool result = getAesItemId(pos, removeMessage.aesItemId);
result &= getAesType(pos, removeMessage.aesType);
DEBUG_LOG(m_logger) << "Got remove message:"
DEBUG_LOG() << "Got remove message:"
<< "\naesItemId = " << removeMessage.aesItemId
<< "\naesType = " << removeMessage.aesType;
@@ -51,7 +50,7 @@ bool CentralAesByteReader::getNContamination(size_t &pos, AreaEffectSimulation::
nContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
DEBUG_LOG(m_logger) << "Got NContamination:"
DEBUG_LOG() << "Got NContamination:"
<< "\nid = " << nContamination.id()
<< "\nname = " << nContamination.name()
<< "\neffectStart = " << nContamination.effectStart()
@@ -84,7 +83,7 @@ bool CentralAesByteReader::getBCContamination(size_t &pos, AreaEffectSimulation:
bCContamination.weatherSource(AreaEffectSimulation::AesWeatherSource::AwsNoUpdate);
DEBUG_LOG(m_logger) << "Got BCContamination:"
DEBUG_LOG() << "Got BCContamination:"
<< "\nid = " << bCContamination.id()
<< "\nname = " << bCContamination.name()
<< "\neffectStart = " << bCContamination.effectStart()
@@ -117,7 +116,7 @@ bool CentralAesByteReader::getExplosionArea(size_t &pos, AreaEffectSimulation::E
result &= getAltitude(pos, explosionArea.altitude());
result &= getPurpose(pos, explosionArea.purpose());
DEBUG_LOG(m_logger) << "Got ExplosionArea:"
DEBUG_LOG() << "Got ExplosionArea:"
<< "\nid = " << explosionArea.id()
<< "\nname = " << explosionArea.name()
<< "\neffectStart = " << explosionArea.effectStart()
@@ -146,7 +145,7 @@ bool CentralAesByteReader::getExplosionSingle(size_t &pos, AreaEffectSimulation:
result &= getAltitude(pos, explosionSingle.altitude());
result &= getPurpose(pos, explosionSingle.purpose());
DEBUG_LOG(m_logger) << "Got ExplosionSingle:"
DEBUG_LOG() << "Got ExplosionSingle:"
<< "\nid = " << explosionSingle.id()
<< "\nname = " << explosionSingle.name()
<< "\neffectStart = " << explosionSingle.effectStart()
@@ -175,7 +174,7 @@ bool CentralAesByteReader::getMineArea(size_t &pos, AreaEffectSimulation::MineAr
result &= getIsCenterLine(pos, mineArea.isCenterLine());
result &= getSegments(pos, mineArea.segments());
DEBUG_LOG(m_logger) << "Got MineArea:"
DEBUG_LOG() << "Got MineArea:"
<< "\nid = " << mineArea.id()
<< "\nname = " << mineArea.name()
<< "\neffectStart = " << mineArea.effectStart()
@@ -213,7 +212,7 @@ bool CentralAesByteReader::getFunctionalArea(size_t &pos, AreaEffectSimulation::
result &= getMedicMode(pos, functionalArea.medicMode());
result &= getMedicTime(pos, functionalArea.medicTime());
DEBUG_LOG(m_logger) << "Got MineArea:"
DEBUG_LOG() << "Got MineArea:"
<< "\nid = " << functionalArea.id()
<< "\nname = " << functionalArea.name()
<< "\neffectStart = " << functionalArea.effectStart()
@@ -247,7 +246,7 @@ bool CentralAesByteReader::getBoobyTrap(size_t &pos, AreaEffectSimulation::Booby
result &= getOptionalNumber(pos, boobyTrap.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, boobyTrap.partyId(), &CentralAesByteReader::getPartyId);
DEBUG_LOG(m_logger) << "Got BoobyTrap:"
DEBUG_LOG() << "Got BoobyTrap:"
<< "\nid = " << boobyTrap.id()
<< "\nname = " << boobyTrap.name()
<< "\neffectDuration = " << boobyTrap.effectDuration()
@@ -274,7 +273,7 @@ bool CentralAesByteReader::getOffRouteMine(size_t &pos, AreaEffectSimulation::Of
result &= getOptionalNumber(pos, offRouteMine.effectStart(), &CentralAesByteReader::getEffectStart);
result &= getOptionalNumber(pos, offRouteMine.partyId(), &CentralAesByteReader::getPartyId);
DEBUG_LOG(m_logger) << "Got OffRouteMine: "
DEBUG_LOG() << "Got OffRouteMine: "
<< "\nid: " << offRouteMine.id()
<< "\nname = " << offRouteMine.name()
<< "\neffectDuration = " << offRouteMine.effectDuration()
@@ -300,7 +299,7 @@ bool CentralAesByteReader::getExplosionCluster(size_t &pos, AreaEffectSimulation
result &= getChargeTypeId(pos, explosionCluster.chargeStruct().chargeTypeId());
result &= getPartyId(pos, explosionCluster.partyId());
DEBUG_LOG(m_logger) << "Got ExplosionCluster:"
DEBUG_LOG() << "Got ExplosionCluster:"
<< "\nid: " << explosionCluster.id()
<< "\nname: " << explosionCluster.name()
<< "\neffectStart: " << explosionCluster.effectStart()