lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp
+41 -42
View File
@@ -35,7 +35,6 @@ NomTests::NomTests(QObject *parent)
, m_notificationId(0)
, m_eTestStep(eUnknown)
, m_bTestsSuccessful(true)
, m_logger(getLogger("NomTests"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
} // end of ctor()
@@ -48,7 +47,7 @@ NomTests::~NomTests()
//-----------------------------------------------------------------------------
bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId)
{
INFO_LOG(m_logger) << "MrkTests::init() "
INFO_LOG() << "MrkTests::init() "
<< " domainId:" << domainId
<< " exerciseId:" << exerciseId
<< " testId: " << testId
@@ -66,22 +65,22 @@ bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
TRACE_LOG(m_logger) << "create ftc";
TRACE_LOG() << "create ftc";
m_ftc = NotificationManagement::Interface::Ftc::create(m_ddsConnector);
TRACE_LOG(m_logger) << "init ftc";
TRACE_LOG() << "init ftc";
bool bRet = m_ftc->enableAll();
TRACE_LOG(m_logger) << "init end - bRet = " << bRet;
TRACE_LOG() << "init end - bRet = " << bRet;
// Access to DTC
TRACE_LOG(m_logger) << "create dtc";
TRACE_LOG() << "create dtc";
m_dtc = NotificationManagement::Interface::Dtc::create(m_ddsConnector);
TRACE_LOG(m_logger) << "init dtc";
TRACE_LOG() << "init dtc";
bRet &= m_dtc->enableAll();
TRACE_LOG(m_logger) << "init end - bRet = " << bRet;
TRACE_LOG() << "init end - bRet = " << bRet;
// Access to OPM DTC
TRACE_LOG(m_logger) << "create opmDtc";
TRACE_LOG() << "create opmDtc";
m_opmDtc = OperatorManagement::Interface::Dtc::create(m_ddsConnector);
m_opmDtc->enableUser();
@@ -91,7 +90,7 @@ bool NomTests::init(int domainId, int exerciseId, int testId, int notificationId
//-----------------------------------------------------------------------------
void NomTests::startTest()
{
INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
<< " testId:" << m_testId
<< " notificationId:" << m_notificationId
;
@@ -130,10 +129,10 @@ void NomTests::tryCreate()
CreateNotificationRequest data;
getCreateNotificationRequestData(data);
INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
INFO_LOG() << "trying to send CreateNotificationRequest";
if (!m_ftc->createNotificationRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
}
@@ -192,7 +191,7 @@ void NomTests::tryCreateHQ()
notifReq.notification(notif);
if (!m_ftc->createNotificationRequest(notifReq, this))
ERROR_LOG(m_logger) << "Error requesting create Notification data";
ERROR_LOG() << "Error requesting create Notification data";
} // end of tryCreate()
@@ -214,10 +213,10 @@ void NomTests::tryReadReceipt()
request.notificationIds({m_notificationId});
request.processed(true);
INFO_LOG(m_logger) << "trying to send CreateNotificationRequest";
INFO_LOG() << "trying to send CreateNotificationRequest";
if (!m_ftc->readReceiptRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting readReceipt data";
ERROR_LOG() << "Error requesting readReceipt data";
failExit();
}
} // end of tryReadReceipt
@@ -231,10 +230,10 @@ void NomTests::tryRemove()
data.id(m_notificationId);
INFO_LOG(m_logger) << "trying to send remove request for notificationId:" << data.id();
INFO_LOG() << "trying to send remove request for notificationId:" << data.id();
if (!m_ftc->notificationRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for notificationId:" << data.id();
ERROR_LOG() << "Error requesting remove data for notificationId:" << data.id();
failExit();
}
*/
@@ -245,12 +244,12 @@ void NomTests::tryRemove()
void NomTests::tryGetAllNotifications()
{
m_eTestStep = eGetAllNotifications;
DEBUG_LOG(m_logger) << "trying to get all notifications";
DEBUG_LOG() << "trying to get all notifications";
m_dtc->waitForHistoricalDataNomNotification();
if (m_dtc->nomNotifications().isEmpty())
{
ERROR_LOG(m_logger) << "Error requesting all notification data";
ERROR_LOG() << "Error requesting all notification data";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
@@ -260,7 +259,7 @@ void NomTests::tryGetAllNotifications()
// needed for Test 11 tryGetNotification
m_notificationId = notif.id();
INFO_LOG(m_logger) << "Nom(" << notif.id() << ") :"
INFO_LOG() << "Nom(" << notif.id() << ") :"
<< " title:" << notif.title()
<< " content:" << notif.content()
<< " timeStamp:" << notif.timeStamp()
@@ -270,7 +269,7 @@ void NomTests::tryGetAllNotifications()
<< " processPrio: " << notif.processedPriority()
<< " recipient count:" << notif.recipientIds().size();
INFO_LOG(m_logger) << "SenderAddress(" << notif.sender().id() << ") :"
INFO_LOG() << "SenderAddress(" << notif.sender().id() << ") :"
<< " name: " << notif.sender().name()
<< ", addressId: " << notif.sender().addressId()
<< ", addressSubId: " << notif.sender().addressSubId()
@@ -285,14 +284,14 @@ void NomTests::tryGetAllNotifications()
//-----------------------------------------------------------------------------
void NomTests::tryGetNotification()
{
DEBUG_LOG(m_logger) << "trying to get notification with id:" << m_notificationId;
DEBUG_LOG() << "trying to get notification with id:" << m_notificationId;
if (m_testId > 1)
m_eTestStep = eGetNotification;
if (m_notificationId <= 0)
{
ERROR_LOG(m_logger) << "invalid notificationId - test aborted.";
ERROR_LOG() << "invalid notificationId - test aborted.";
failExit();
}
@@ -301,12 +300,12 @@ void NomTests::tryGetNotification()
if (notif.id() <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for notificationId " << m_notificationId << " returnVal:" << notif.id();
ERROR_LOG() << "Error receiving data for notificationId " << m_notificationId << " returnVal:" << notif.id();
failExit();
}
else
{
INFO_LOG(m_logger) << "NomNotification(" << notif.id() << ") :"
INFO_LOG() << "NomNotification(" << notif.id() << ") :"
<< " title:" << notif.title()
<< " content:" << notif.content()
<< " timeStamp:" << notif.timeStamp()
@@ -318,7 +317,7 @@ void NomTests::tryGetNotification()
for (const NotificationManagement::Address &addr : notif.recipientIds())
{
INFO_LOG(m_logger) << "Recipient(" << addr.id() << ") :"
INFO_LOG() << "Recipient(" << addr.id() << ") :"
<< " name: " << addr.name()
<< ", addressId: " << addr.addressId()
<< ", addressSubId: " << addr.addressSubId()
@@ -327,7 +326,7 @@ void NomTests::tryGetNotification()
<< ", isRead: " << addr.isRead();
}
INFO_LOG(m_logger) << "SenderAddress(" << notif.sender().id() << ") :"
INFO_LOG() << "SenderAddress(" << notif.sender().id() << ") :"
<< " name: " << notif.sender().name()
<< ", addressId: " << notif.sender().addressId()
<< ", addressSubId: " << notif.sender().addressSubId()
@@ -341,7 +340,7 @@ void NomTests::tryGetNotification()
{
if (! onCompareCreatedData(notif))
{
ERROR_LOG(m_logger) << "Compare created data failed!";
ERROR_LOG() << "Compare created data failed!";
failExit();
}
else
@@ -360,19 +359,19 @@ void NomTests::tryGetNotification()
//-----------------------------------------------------------------------------
void NomTests::onCreateNotificationReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
INFO_LOG() << "Got createReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_notificationId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
if (m_testId == 0)
// QTimer::singleShot(0, this, &NomTests::tryModify()));
@@ -386,17 +385,17 @@ void NomTests::onCreateNotificationReply(const Core::FunctionReplyObject &replyO
void NomTests::onReadReceiptReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got onReadReceipt with id " << replyObject.id()
INFO_LOG() << "Got onReadReceipt with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting ReadReceipt data for id:" << replyObject.id();
ERROR_LOG() << "Error requesting ReadReceipt data for id:" << replyObject.id();
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting ReadReceipt data for id:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting ReadReceipt data for id:" << replyObject.id() << " ... ok.";
if (m_testId == 0)
// QTimer::singleShot(0, this, &MrkTests::tryDelete()));
@@ -410,17 +409,17 @@ void NomTests::onReadReceiptReply(const Core::FunctionReplyObject &replyObject)
/*
void NomTests::onNotificationRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
INFO_LOG() << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting remove data for NotificationId:" << replyObject.id();
ERROR_LOG() << "Error requesting remove data for NotificationId:" << replyObject.id();
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting remove data for NotificationId:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting remove data for NotificationId:" << replyObject.id() << " ... ok.";
if (m_testId == 0)
{
@@ -436,21 +435,21 @@ void NomTests::onNotificationRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void NomTests::onReceiveNotificationChanged(const NomNotification &data, DataModification modType)
{
// INFO_LOG(m_logger) << "onReceiveNotificationChanged() notificationId:" << data.id()
// INFO_LOG() << "onReceiveNotificationChanged() notificationId:" << data.id()
// << " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG(m_logger) << "*** NomNotification added received. notificationId:" << data.id();
INFO_LOG() << "*** NomNotification added received. notificationId:" << data.id();
break;
case DataModification::eModified:
INFO_LOG(m_logger) << "*** NomNotification modified received. notificationId:" << data.id();
INFO_LOG() << "*** NomNotification modified received. notificationId:" << data.id();
break;
case DataModification::eRemoved:
INFO_LOG(m_logger) << "*** NomNotification removed received. notificationId:" << data.id();
INFO_LOG() << "*** NomNotification removed received. notificationId:" << data.id();
break;
}
@@ -506,7 +505,7 @@ void NomTests::getCreateNotificationRequestData(CreateNotificationRequest &data)
//-----------------------------------------------------------------------------
bool NomTests::onCompareCreatedData(NomNotification &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten