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 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainId(), IDL::PartitionType::Exercise, exerciseId))
, m_exerciseId(exerciseId)
, m_idleTimer(new QTimer(this))
, m_logger(getLogger("ExerciseHandler"))
{
connect(m_idleTimer, &QTimer::timeout,
this, &ExerciseHandler::exerciseHandlerIdleTimeout);
@@ -27,7 +26,7 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
bool ExerciseHandler::init()
{
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG(m_logger) << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
DEBUG_LOG() << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
<< " m_exerciseId=" << m_exerciseId;
m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
bool retVal = m_tabFtc->enableSendEquipmentMessage();
@@ -44,7 +43,7 @@ bool ExerciseHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipment
{
if (!m_tabFtc)
return false;
DEBUG_LOG(m_logger) << "ExerciseHandler::sendEquipmentMessage: " << request;
DEBUG_LOG() << "ExerciseHandler::sendEquipmentMessage: " << request;
m_idleTimer->stop();
return m_tabFtc->sendEquipmentMessageRequest(request, this);
}
@@ -53,7 +52,7 @@ bool ExerciseHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquipm
{
if (!m_ossFtc)
return false;
DEBUG_LOG(m_logger) << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
DEBUG_LOG() << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
m_idleTimer->stop();
return m_ossFtc->sendEquipmentMessageOcRequest(request, this);
}
@@ -65,19 +64,19 @@ int ExerciseHandler::exerciseId() const
void ExerciseHandler::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageReply";
DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageReply";
m_idleTimer->start();
if (replyObject.error())
ERROR_LOG(m_logger) << replyObject();
ERROR_LOG() << replyObject();
emit equipmentMessageReply(replyObject.id(), !replyObject.error());
}
void ExerciseHandler::onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageOcReply";
DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageOcReply";
m_idleTimer->start();
if (replyObject.error())
ERROR_LOG(m_logger) << replyObject();
ERROR_LOG() << replyObject();
emit equipmentMessageOcReply(replyObject.id(), !replyObject.error());
}
} // namespace Messaging