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/AlarmManagement/ModuleTests/alm_tests.cpp
+19 -20
View File
@@ -34,7 +34,6 @@ AlmTests::AlmTests(QObject *parent)
: QObject(parent)
, m_testId(0)
, m_bTestsSuccessful(true)
, m_logger(getLogger("AlmTests"))
, m_participantIndex(0)
{}
@@ -45,7 +44,7 @@ AlmTests::~AlmTests()
// ------------------------------------------------------------------
bool AlmTests::init(int domainId, int testId, int operatorId)
{
INFO_LOG(m_logger) << "init begin";
INFO_LOG() << "init begin";
m_testId = testId;
m_operatorId = operatorId;
@@ -74,7 +73,7 @@ bool AlmTests::init(int domainId, int testId, int operatorId)
// ------------------------------------------------------------------
void AlmTests::startTest()
{
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
INFO_LOG() << "startTest m_testId=" << m_testId;
if (m_testId <= 1) // Send FTC ConfigureAlarms and EEM Event
{
QTimer::singleShot(0, this, &AlmTests::tryConfigureAlarms);
@@ -103,7 +102,7 @@ void AlmTests::startTest()
// ------------------------------------------------------------------
void AlmTests::tryConfigureAlarms()
{
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
INFO_LOG() << "trying to send createRequest Operator Message";
std::vector<AlarmManagement::AlarmAction> alarms;
alarms.resize(2);
@@ -125,7 +124,7 @@ void AlmTests::tryConfigureAlarms()
if (!m_ftcAlm->configureAlarmsRequest(ConfigureAlarmsRequest(alarms, m_operatorId, participantIds, globalEvent, remove), this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
} // tryConfigureAlarms
@@ -133,7 +132,7 @@ void AlmTests::tryConfigureAlarms()
// ------------------------------------------------------------------
void AlmTests::tryCreateParticipant()
{
INFO_LOG(m_logger) << "trying to create Participant index = " << m_participantIndex;
INFO_LOG() << "trying to create Participant index = " << m_participantIndex;
ParticipantManagement::Participant participant;
switch (m_participantIndex)
{
@@ -154,10 +153,10 @@ void AlmTests::tryCreateParticipant()
participant.partyId(5);
break;
}
DEBUG_LOG(m_logger) << "Publishing Participant";
DEBUG_LOG() << "Publishing Participant";
if (!m_dtsPpm->publish(participant))
{
ERROR_LOG(m_logger) << "Error publish Participant";
ERROR_LOG() << "Error publish Participant";
failExit();
}
m_participantIndex++;
@@ -166,7 +165,7 @@ void AlmTests::tryCreateParticipant()
// ------------------------------------------------------------------
void AlmTests::tryConfigureAlarmsList()
{
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
INFO_LOG() << "trying to send createRequest Operator Message";
std::vector<AlarmManagement::AlarmAction> alarms;
alarms.resize(2);
@@ -189,7 +188,7 @@ void AlmTests::tryConfigureAlarmsList()
if (!m_ftcAlm->configureAlarmsRequest(ConfigureAlarmsRequest(alarms, m_operatorId, participantIds, globalEvent, remove), this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
} // tryConfigureAlarmsList
@@ -197,7 +196,7 @@ void AlmTests::tryConfigureAlarmsList()
// ------------------------------------------------------------------
void AlmTests::trySendEvent()
{
INFO_LOG(m_logger) << "trying to send ParticipantEvent";
INFO_LOG() << "trying to send ParticipantEvent";
ExerciseEventManagement::Event pe;
@@ -216,10 +215,10 @@ void AlmTests::trySendEvent()
QString properties = QString::fromUtf8(QJsonDocument(obj).toJson());
pe.properties(properties.toStdString());
DEBUG_LOG(m_logger) << "Publishing EEM Event";
DEBUG_LOG() << "Publishing EEM Event";
if (!m_dtsEem->publish(pe))
{
ERROR_LOG(m_logger) << "Error publish EEM Event";
ERROR_LOG() << "Error publish EEM Event";
failExit();
}
}
@@ -227,10 +226,10 @@ void AlmTests::trySendEvent()
// ------------------------------------------------------------------
void AlmTests::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "onConfigureAlarmsReply, error = " << replyObject.error();
INFO_LOG() << "onConfigureAlarmsReply, error = " << replyObject.error();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error ConfigureAlarms - aborting";
ERROR_LOG() << "Error ConfigureAlarms - aborting";
failExit();
}
} // onConfigureAlarmsReply
@@ -238,11 +237,11 @@ void AlmTests::onConfigureAlarmsReply(const Core::FunctionReplyObject &replyObje
// ------------------------------------------------------------------
void AlmTests::checkAlarm()
{
INFO_LOG(m_logger) << "checkAlarm";
INFO_LOG() << "checkAlarm";
m_dtcAlm->waitForHistoricalDataNotification();
qint32 id = 0;
AlarmManagement::Notification notification = m_dtcAlm->notification(id);
INFO_LOG(m_logger) << "Recived AlarmManagement::Notification: " << notification
INFO_LOG() << "Recived AlarmManagement::Notification: " << notification
<< " testId: " << m_testId;
switch (m_testId)
@@ -250,12 +249,12 @@ void AlmTests::checkAlarm()
case 1:
case 2:
case 3:
INFO_LOG(m_logger) << "ExitSuccess";
INFO_LOG() << "ExitSuccess";
ExitSuccess();
break;
default:
// nothing
INFO_LOG(m_logger) << "failExit";
INFO_LOG() << "failExit";
failExit();
break;
}
@@ -271,7 +270,7 @@ void AlmTests::failExit()
// ------------------------------------------------------------------
void AlmTests::ExitSuccess()
{
DEBUG_LOG(m_logger) << "SUCCESS";
DEBUG_LOG() << "SUCCESS";
m_bTestsSuccessful = true;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
} // ExitSuccess