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

@@ -21,7 +21,6 @@ HandlerActiveApps::HandlerActiveApps(MainHandler *mainHandler)
: Interface::Fts::ActiveAppUpdateRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::ActiveAppRemoveRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerActiveApps"))
{
}
@@ -44,7 +43,7 @@ bool HandlerActiveApps::init()
void HandlerActiveApps::cleanupOperator(int operatorId)
{
INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId
INFO_LOG() << "cleanupOperator operatorId: " << operatorId
<< ", m_activeApps.size = " << m_activeApps.size();
// Operator has logged in or out or WS is not alive anymore:
@@ -56,7 +55,7 @@ void HandlerActiveApps::cleanupOperator(int operatorId)
const ActiveApp &item = it.value();
if (item.operatorId() == operatorId)
{
INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
INFO_LOG() << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
dtsPtr->removeActiveAppByKey(item.id());
it = m_activeApps.erase(it);
}
@@ -93,11 +92,11 @@ void HandlerActiveApps::removeZombieEntry(const ActiveApp &request)
void HandlerActiveApps::onActiveAppUpdateRequest(const rti::core::SampleIdentity &cookie,
const ActiveApp &request)
{
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest: " << request;
DEBUG_LOG() << "onActiveAppUpdateRequest: " << request;
auto ret = activeAppUpdateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - returned id: " << ret.id();
WARNING_LOG() << ret();
DEBUG_LOG() << "onActiveAppUpdateRequest - returned id: " << ret.id();
fts()->activeAppUpdateReply(cookie, ret);
}
@@ -136,7 +135,7 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
// copy data
it.value() = request;
}
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - publish new data: " << it.value();
DEBUG_LOG() << "onActiveAppUpdateRequest - publish new data: " << it.value();
dts()->publish(it.value());
return Core::FunctionReplyObject(it.value().id());
}
@@ -144,10 +143,10 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
void HandlerActiveApps::onActiveAppRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG(m_logger) << "onActiveAppRemoveRequest: " << request;
DEBUG_LOG() << "onActiveAppRemoveRequest: " << request;
auto ret = activeAppRemoveRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
fts()->activeAppRemoveReply(cookie, ret);
}