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

@@ -24,7 +24,6 @@ SrpDtTests::SrpDtTests(QObject *parent)
, m_replayPartitionId(0)
, m_situationReplayId(0)
, m_bTestsSuccessful(true)
, m_logger(getLogger("DtTest"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
}
@@ -36,7 +35,7 @@ SrpDtTests::~SrpDtTests()
//---------------------------------------------------------------------------------
bool SrpDtTests::init(int domainId, int replayPartitionId)
{
DEBUG_LOG(m_logger) << "init begin";
DEBUG_LOG() << "init begin";
m_replayPartitionId = replayPartitionId;
// initialize DDS
@@ -52,11 +51,11 @@ bool SrpDtTests::init(int domainId, int replayPartitionId)
// DdsInterface Publisher
//m_ddsConnector->setPublisher(new Publisher(domainId, m_ddsConnector->getPartition(), m_ddsConnector->getDomainParticipant()));
DEBUG_LOG(m_logger) << "Create dtc";
DEBUG_LOG() << "Create dtc";
m_dtc = SituationReplay::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "Init dtc";
DEBUG_LOG() << "Init dtc";
bool bRet = m_dtc->enableAll();
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
DEBUG_LOG() << "init end - bRet = " << bRet;
connect(m_dtc.get(), &SituationReplay::Interface::Dtc::sitReplayChanged,
this, &SrpDtTests::onReceiveSituationReplayData);
@@ -67,26 +66,26 @@ bool SrpDtTests::init(int domainId, int replayPartitionId)
//---------------------------------------------------------------------------------
void SrpDtTests::startTest()
{
INFO_LOG(m_logger) << "startTest";
INFO_LOG() << "startTest";
QTimer::singleShot(1000, this, &SrpDtTests::tryGetAllSituationReplays);
}
//---------------------------------------------------------------------------------
void SrpDtTests::tryGetAllSituationReplays()
{
INFO_LOG(m_logger) << "trying to get all situationReplays";
INFO_LOG() << "trying to get all situationReplays";
const QMap<qint32, SituationReplay::SitReplay> map = m_dtc->sitReplays();
if (map.isEmpty())
{
ERROR_LOG(m_logger) << "Error requesting all situation replay data";
ERROR_LOG() << "Error requesting all situation replay data";
failExit();
}
else
{
INFO_LOG(m_logger) << "Amout of existing situation replays = " << map.size();
INFO_LOG() << "Amout of existing situation replays = " << map.size();
m_situationReplayId = map.firstKey();
for(auto it = map.begin(); it != map.end(); ++it)
INFO_LOG(m_logger) << "situationReplay(" << it.key() << ") : " << it.value().replayPartitionId() ;
INFO_LOG() << "situationReplay(" << it.key() << ") : " << it.value().replayPartitionId() ;
}
QTimer::singleShot(10, this, &SrpDtTests::tryGetSituationReplay);
@@ -95,17 +94,17 @@ void SrpDtTests::tryGetAllSituationReplays()
//---------------------------------------------------------------------------------
void SrpDtTests::tryGetSituationReplay()
{
INFO_LOG(m_logger) << "trying get itemData for situationReplay " << m_situationReplayId;
INFO_LOG() << "trying get itemData for situationReplay " << m_situationReplayId;
SituationReplay::SitReplay data = m_dtc->sitReplay(m_situationReplayId);
if (data.id() <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for situation replay " << m_situationReplayId;
ERROR_LOG() << "Error receiving data for situation replay " << m_situationReplayId;
failExit();
}
else
{
INFO_LOG(m_logger) << "## SitReplay(" << data.id() << "), replayPartition: " << data.replayPartitionId()
INFO_LOG() << "## SitReplay(" << data.id() << "), replayPartition: " << data.replayPartitionId()
<< ", on exercise " << data.exerciseId();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -115,7 +114,7 @@ void SrpDtTests::tryGetSituationReplay()
void SrpDtTests::onReceiveSituationReplayData(const SituationReplay::SitReplay &data)
{
if (m_situationReplayId == data.id())
INFO_LOG(m_logger) << "##################### Data for id = " << data.id() << " received";
INFO_LOG() << "##################### Data for id = " << data.id() << " received";
}
// ------------------------------------------------------------------------------