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

@@ -18,7 +18,6 @@ HandlerInjuryModel::HandlerInjuryModel(MainHandler *mainHandler)
: Interface::Fts::ModifyInjuryModelAgdusWhRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::RemoveInjuryModelAgdusWhRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerInjuryModel"))
{}
HandlerInjuryModel::~HandlerInjuryModel()
@@ -37,7 +36,7 @@ bool HandlerInjuryModel::init()
if(ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
bRet = false;
return;
}
@@ -45,18 +44,18 @@ bool HandlerInjuryModel::init()
};
if (!m_mainHandler->db()->select(cb) || !bRet)
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return true;
}
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_injurymodelObjMap.size();
DEBUG_LOG() << "m_exeObjMap.size() = " << m_injurymodelObjMap.size();
return true;
}
void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const InjuryModelAgdusWh &request)
{
DEBUG_LOG(m_logger) << "onModifyInjuryModelAgdusWhRequest() id:" << request.id();
DEBUG_LOG() << "onModifyInjuryModelAgdusWhRequest() id:" << request.id();
Core::FunctionReplyObject ret;
if (request.id() <= 0)
@@ -74,7 +73,7 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
{
delete ifs;
ifs = nullptr;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
}
else
m_injurymodelObjMap.insert(ifs->getId(), ifs);
@@ -99,14 +98,14 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
}
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
m_mainHandler->dds()->fts()->modifyInjuryModelAgdusWhReply(cookie, ret);
}
void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id();
DEBUG_LOG() << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id();
Core::FunctionReplyObject ret;
ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id());
@@ -120,7 +119,7 @@ void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::Samp
ret = ifs->removeObject();
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
// delete ObjectInjuryModel