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:
2785 files changed
+18754
-18316
No files matched your search
@@ -19,7 +19,6 @@ namespace Messaging
|
||||
{
|
||||
ExercisesHandler::ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_logger(getLogger("ExercisesHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -37,7 +36,7 @@ bool ExercisesHandler::init()
|
||||
if (!m_ppmDtc->enableEquipmentExerciseMapping())
|
||||
return false;
|
||||
|
||||
ERROR_LOG(m_logger) << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
ERROR_LOG() << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -57,7 +56,7 @@ bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmen
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -73,7 +72,7 @@ bool ExercisesHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquip
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -87,10 +86,10 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
if (itEH != m_exerciseHandler.end())
|
||||
return itEH.value();
|
||||
|
||||
DEBUG_LOG(m_logger) << "new ExerciseHandler for id " << exerciseId;
|
||||
DEBUG_LOG() << "new ExerciseHandler for id " << exerciseId;
|
||||
auto exH = new ExerciseHandler(m_ddsHandler->ddsConnector(), exerciseId);
|
||||
bool result = exH->init();
|
||||
DEBUG_LOG(m_logger)<<"result init ="<<result;
|
||||
DEBUG_LOG()<<"result init ="<<result;
|
||||
connect(exH, &ExerciseHandler::exerciseHandlerIdleTimeout,
|
||||
this, &ExercisesHandler::onExerciseHandlerIdleTimeout);
|
||||
m_exerciseHandler[exerciseId] = exH;
|
||||
@@ -100,7 +99,7 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEquipmentExerciseMappingChanged";
|
||||
DEBUG_LOG() << "onEquipmentExerciseMappingChanged";
|
||||
|
||||
for (auto it = m_equipNo2ExerciseId.begin(); it != m_equipNo2ExerciseId.end(); )
|
||||
{
|
||||
@@ -130,7 +129,7 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
|
||||
|
||||
void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged";
|
||||
DEBUG_LOG() << "onEquipmentMessageChanged";
|
||||
if (modType != DataModification::eAdded &&
|
||||
modType != DataModification::eModified)
|
||||
return;
|
||||
@@ -138,7 +137,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
const auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.constEnd())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
ERROR_LOG() << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
return;
|
||||
}
|
||||
emit messageFromTrainingArea(data);
|
||||
@@ -146,7 +145,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
|
||||
void ExercisesHandler::onExerciseHandlerIdleTimeout()
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"onExerciseHandlerIdleTimeout";
|
||||
DEBUG_LOG()<<"onExerciseHandlerIdleTimeout";
|
||||
ExerciseHandler *exH = qobject_cast<ExerciseHandler *>(sender());
|
||||
if (!exH)
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user