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

@@ -25,7 +25,6 @@ HandlerNotification::HandlerNotification(const std::shared_ptr<DdsHandler> &ddsH
, m_removeNotificationTimer(new QTimer())
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("HandlerNotification"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -38,14 +37,14 @@ HandlerNotification::~HandlerNotification()
bool HandlerNotification::init()
{
INFO_LOG(m_logger) << "--- Start NotificationManagement HandlerNotification.";
INFO_LOG() << "--- Start NotificationManagement HandlerNotification.";
QVector<Database::NomAddress> dataAddressVec;
// read all addresses from database
if (!m_db->select(dataAddressVec))
{
ERROR_LOG(m_logger) << "Error reading address data from database!";
ERROR_LOG() << "Error reading address data from database!";
return false;
}
@@ -59,7 +58,7 @@ bool HandlerNotification::init()
// Remove old notifications
if (isRemoveable(notif))
{
INFO_LOG(m_logger) << "Remove old notification " << notif.title() << ", id = " << notif.id();
INFO_LOG() << "Remove old notification " << notif.title() << ", id = " << notif.id();
removeNotificationIds.append(notif.id());
return;
}
@@ -82,7 +81,7 @@ bool HandlerNotification::init()
if (ret.error())
{
delete ifs;
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
bRet = false;
return;
}
@@ -90,7 +89,7 @@ bool HandlerNotification::init()
};
if (!m_db->select(cb) || !bRet)
{
ERROR_LOG(m_logger) << "Error reading data from database!";
ERROR_LOG() << "Error reading data from database!";
return false;
}
@@ -100,11 +99,11 @@ bool HandlerNotification::init()
m_db->removeNomNotification(notificationId);
trans.commit();
DEBUG_LOG(m_logger) << "m_objectNotificationMap.size() = " << m_objectNotificationMap.size();
DEBUG_LOG() << "m_objectNotificationMap.size() = " << m_objectNotificationMap.size();
if (!m_ddsHandler->fts())
{
ERROR_LOG(m_logger) << "m_ddsHandler->fts() == nullptr!";
ERROR_LOG() << "m_ddsHandler->fts() == nullptr!";
return false;
}
@@ -119,8 +118,8 @@ bool HandlerNotification::init()
connect(m_removeNotificationTimer, &QTimer::timeout, this, &HandlerNotification::onCheckRemove);
m_removeNotificationTimer->start();
DEBUG_LOG(m_logger) << "removeTimerInterval: " << Settings::removeTimerIntervalMSec();
DEBUG_LOG(m_logger) << "expiryTime: " << Settings::expiryIntervalMSec();
DEBUG_LOG() << "removeTimerInterval: " << Settings::removeTimerIntervalMSec();
DEBUG_LOG() << "expiryTime: " << Settings::expiryIntervalMSec();
return true;
} // end of init()
@@ -129,14 +128,14 @@ bool HandlerNotification::init()
void HandlerNotification::onCreateNotificationRequest(const rti::core::SampleIdentity &cookie,
const CreateNotification &request)
{
DEBUG_LOG(m_logger) << "onCreateNotificationRequest: " << request;
DEBUG_LOG() << "onCreateNotificationRequest: " << request;
ObjectNotification *ifs(new ObjectNotification(m_ddsHandler, m_db));
const Core::FunctionReplyObject ret = ifs->createObject(request.notification());
if (ret.error())
{
delete ifs;
WARNING_LOG(m_logger) << ret();
WARNING_LOG() << ret();
m_ddsHandler->fts()->createNotificationReply(cookie, ret);
return;
}
@@ -150,7 +149,7 @@ void HandlerNotification::onCreateNotificationRequest(const rti::core::SampleIde
void HandlerNotification::onReadReceiptRequest(const rti::core::SampleIdentity &cookie,
const ReadReceipt &request)
{
DEBUG_LOG(m_logger) << "onReadReceiptRequest: " << request;
DEBUG_LOG() << "onReadReceiptRequest: " << request;
Core::FunctionReplyObject ret;
for (const auto notificationId : request.notificationIds())
@@ -171,7 +170,7 @@ void HandlerNotification::onReadReceiptRequest(const rti::core::SampleIdentity &
void HandlerNotification::onDeleteMessageRequest(const rti::core::SampleIdentity &cookie, const DeleteMessage &request)
{
DEBUG_LOG(m_logger) << "onDeleteMessageRequest: " << request;
DEBUG_LOG() << "onDeleteMessageRequest: " << request;
Core::FunctionReplyObject ret;
for (const auto notificationId : request.notificationIds())
@@ -204,10 +203,10 @@ void HandlerNotification::onExerciseChanged(const ExerciseManagement::Exercise &
if (obj->notification().exerciseId() != data.id())
continue;
DEBUG_LOG(m_logger) << "Remove notification " << obj->id();
DEBUG_LOG() << "Remove notification " << obj->id();
Core::FunctionReplyObject ret = obj->removeObject();
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
// delete ObjectNotification
@@ -230,10 +229,10 @@ void HandlerNotification::onCheckRemove()
if (!isRemoveable(notif))
continue;
DEBUG_LOG(m_logger) << "Remove notification " << obj->id();
DEBUG_LOG() << "Remove notification " << obj->id();
Core::FunctionReplyObject ret = obj->removeObject();
if (ret.error())
ERROR_LOG(m_logger) << ret();
ERROR_LOG() << ret();
else
{
// delete ObjectNotification