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/Proxies/CombatNetRadio/exercise_manager.cpp
+9 -10
View File
@@ -67,7 +67,6 @@ public:
ExerciseManager::ExerciseManager(ActiveExercises *activeExercises, DdsHandler *ddsHandler)
: m_activeExercises(activeExercises)
, m_ddsHandler(ddsHandler)
, m_logger(getLogger("ExerciseManager"))
{
Q_ASSERT(activeExercises);
Q_ASSERT(ddsHandler);
@@ -112,13 +111,13 @@ std::vector<WebSocketInterface::Messages::ReplyMessage> ExerciseManager::radioSt
WebSocketInterface::Messages::ReplyMessage ExerciseManager::configCnr(const QString &uuid)
{
DEBUG_LOG(m_logger) << LOGFUNCTION;
DEBUG_LOG() << Q_FUNC_INFO;
const WebSocketInterface::Messages::ErrorMessage noActivePlanning(1, uuid, QStringLiteral("No active frequency planning found"));
if (m_parts.empty())
{
DEBUG_LOG(m_logger) << "No active frequency planning due to empty m_parts.";
DEBUG_LOG() << "No active frequency planning due to empty m_parts.";
return noActivePlanning;
}
@@ -142,7 +141,7 @@ WebSocketInterface::Messages::ReplyMessage ExerciseManager::configCnr(const QStr
if (configCnrData.radioCircuit.empty())
{
DEBUG_LOG(m_logger) << "No active frequency planning due to empty radio circuits.";
DEBUG_LOG() << "No active frequency planning due to empty radio circuits.";
return noActivePlanning;
}
@@ -183,25 +182,25 @@ WebSocketInterface::Messages::ReplyMessage ExerciseManager::positionsCnr(const Q
void ExerciseManager::onModifyFrequencyPlanningStatusReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
ERROR_LOG(m_logger) << "Error while modifying FrequencyPlanningStatus: " << replyObject.str();
ERROR_LOG() << "Error while modifying FrequencyPlanningStatus: " << replyObject.str();
else
INFO_LOG(m_logger) << "onModifyFrequencyPlanningStatusReply ok";
INFO_LOG() << "onModifyFrequencyPlanningStatusReply ok";
}
void ExerciseManager::onClearFrequencyPlanningStatusReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
ERROR_LOG(m_logger) << "Error while clearing FrequencyPlanningStatus: " << replyObject.str();
ERROR_LOG() << "Error while clearing FrequencyPlanningStatus: " << replyObject.str();
else
INFO_LOG(m_logger) << "onClearFrequencyPlanningStatusReply ok";
INFO_LOG() << "onClearFrequencyPlanningStatusReply ok";
}
void ExerciseManager::onRemoveFrequencyPlanningStatusByClientReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
ERROR_LOG(m_logger) << "Error while removing FrequencyPlanningStatus: " << replyObject.str();
ERROR_LOG() << "Error while removing FrequencyPlanningStatus: " << replyObject.str();
else
INFO_LOG(m_logger) << "onRemoveFrequencyPlanningStatusByClientReply ok";
INFO_LOG() << "onRemoveFrequencyPlanningStatusByClientReply ok";
}
void ExerciseManager::setPositionsUpdateInterval(std::chrono::milliseconds interval)