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 @@ SrpFtTests::SrpFtTests(QObject *parent)
, m_replayPartitionId(0)
, m_testId(All)
, m_bTestsSuccessful(true)
, m_logger(getLogger("FtTest"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
}
@@ -37,7 +36,7 @@ SrpFtTests::~SrpFtTests()
//--------------------------------------------------------------------------------------------------------
bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int srpId)
{
INFO_LOG(m_logger) << "init begin";
INFO_LOG() << "init begin";
m_testId = testId;
m_replayPartitionId = replayPartitionId;
@@ -54,11 +53,11 @@ bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int sr
// Publish/Subscribe on replayPartition
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG(m_logger) << "create ftc";
DEBUG_LOG() << "create ftc";
m_ftc = SituationReplay::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init ftc";
DEBUG_LOG() << "init ftc";
bool bRet = m_ftc->enableAll();
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
DEBUG_LOG() << "init end - bRet = " << bRet;
return bRet;
}
@@ -66,7 +65,7 @@ bool SrpFtTests::init(int domainId, TestId testId, int replayPartitionId, int sr
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::startTest()
{
INFO_LOG(m_logger) << "startTest";
INFO_LOG() << "startTest";
if (m_testId <= TryStart)
QTimer::singleShot(0, this, &SrpFtTests::tryStart);
@@ -83,7 +82,7 @@ void SrpFtTests::startTest()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::tryStart()
{
INFO_LOG(m_logger) << "trying to send startReplay";
INFO_LOG() << "trying to send startReplay";
m_currentTestId = TryStart;
qint64 beginTime = 1468401389668;
@@ -100,7 +99,7 @@ void SrpFtTests::tryStart()
if (!m_ftc->changeReplayStateRequest(req, this))
{
ERROR_LOG(m_logger) << "Error starting replay for srp " << m_replayPartitionId;
ERROR_LOG() << "Error starting replay for srp " << m_replayPartitionId;
failExit();
}
}
@@ -108,7 +107,7 @@ void SrpFtTests::tryStart()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::tryNotAllowedChange()
{
INFO_LOG(m_logger) << "trying to send changeReplayState (start) => should fail (not possible with this method)";
INFO_LOG() << "trying to send changeReplayState (start) => should fail (not possible with this method)";
m_currentTestId = TryNotAllowedChange;
switchToState(SituationReplay::SrpState::Started);
}
@@ -116,7 +115,7 @@ void SrpFtTests::tryNotAllowedChange()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::tryChangePaused()
{
INFO_LOG(m_logger) << "trying to send changeReplayState (Paused)";
INFO_LOG() << "trying to send changeReplayState (Paused)";
m_currentTestId = TryChangePaused;
switchToState(SituationReplay::SrpState::Paused);
}
@@ -124,7 +123,7 @@ void SrpFtTests::tryChangePaused()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::tryChangeResumed()
{
INFO_LOG(m_logger) << "trying to send changeReplayState (Resumed)";
INFO_LOG() << "trying to send changeReplayState (Resumed)";
m_currentTestId = TryChangeResumed;
switchToState(SituationReplay::SrpState::Resumed);
}
@@ -132,7 +131,7 @@ void SrpFtTests::tryChangeResumed()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::tryStop()
{
INFO_LOG(m_logger) << "trying to send stopReplay";
INFO_LOG() << "trying to send stopReplay";
m_currentTestId = TryStop;
switchToState(SituationReplay::SrpState::Stopped);
}
@@ -140,7 +139,7 @@ void SrpFtTests::tryStop()
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::startReplayReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got startReplayReply with id " << replyObject.id();
INFO_LOG() << "Got startReplayReply with id " << replyObject.id();
m_situationReplayId = replyObject.id();
if (m_testId == 0 && !replyObject.error())
QTimer::singleShot(0, this, &SrpFtTests::tryNotAllowedChange);
@@ -151,9 +150,9 @@ void SrpFtTests::startReplayReply(const Core::FunctionReplyObject &replyObject)
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::changeReplayStateReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got changeReplayStateReply with id " << replyObject.id();
INFO_LOG() << "Got changeReplayStateReply with id " << replyObject.id();
if (replyObject.error())
INFO_LOG(m_logger) << ", string: " << replyObject.translated();
INFO_LOG() << ", string: " << replyObject.translated();
if (m_testId == 0 && !replyObject.error())
{
if (m_currentTestId == TryNotAllowedChange)
@@ -170,7 +169,7 @@ void SrpFtTests::changeReplayStateReply(const Core::FunctionReplyObject &replyOb
//--------------------------------------------------------------------------------------------------------
void SrpFtTests::stopReplayReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got stopReplayReply with id " << replyObject.id() ;
INFO_LOG() << "Got stopReplayReply with id " << replyObject.id() ;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -214,7 +213,7 @@ void SrpFtTests::switchToState(SrpState state)
if (!m_ftc->changeReplayStateRequest(req, this))
{
ERROR_LOG(m_logger) << "Error changing replay state for srp " << m_situationReplayId << "(" << m_replayPartitionId << ")";
ERROR_LOG() << "Error changing replay state for srp " << m_situationReplayId << "(" << m_replayPartitionId << ")";
failExit();
}
}