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/OcSituationServer/position_converter.cpp
+4 -5
View File
@@ -20,7 +20,6 @@ PositionConverter::PositionConverter(MainHandler *m_mainHandler)
, m_baseCoord(LtsCoordTrans::UtmCoordinate())
, m_asmDtc(AssetManagement::Interface::Dtc::create(m_mainHandler->dds()->dds()))
, m_exmDtc(ExerciseManagement::Interface::Dtc::create(m_mainHandler->dds()->dds()))
, m_logger(getLogger("PositionConverter"))
{
m_exmDtc->enableExercise();
m_asmDtc->enableTrainingArea();
@@ -42,24 +41,24 @@ bool PositionConverter::initCoordConversion()
if (!m_exmDtc->waitForHistoricalDataExercise(15000))
{
ERROR_LOG(m_logger) << "Error initializing ExerciseManagement DTC";
ERROR_LOG() << "Error initializing ExerciseManagement DTC";
return false;
}
const auto ex = m_exmDtc->exercise(m_mainHandler->exerciseId());
if (ex.id() <= 0)
{
ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
ERROR_LOG() << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId();
return false;
}
if (!m_asmDtc->waitForHistoricalDataTrainingArea(10000))
{
ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC";
ERROR_LOG() << "Error initializing AssetManagement DTC";
return false;
}
const auto ta = m_asmDtc->trainingArea(ex.trainingAreaId());
if (ta.id() <= 0)
{
ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId();
ERROR_LOG() << "Can not retrieve training are information for id " << ex.trainingAreaId();
return false;
}