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

@@ -36,9 +36,9 @@ DataTopicTests::DataTopicTests()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("UnitTests.DataTopicTests"))
{
if (!DDS::QosProfile::setDefault())
ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
ERROR_LOG() << "Error setting default QoS from xml-file ";
DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId;
DEBUG_LOG() << "Main thread ID is " << m_mainThreadId;
}
DataTopicTests::~DataTopicTests()
@@ -79,7 +79,7 @@ bool DataTopicTests::initPublisher()
partitionQos.name( { partition } );
publisherQos << partitionQos;
DEBUG_LOG(m_logger) << "Publish on partition " << partition;
DEBUG_LOG() << "Publish on partition " << partition;
m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos);
@@ -91,8 +91,8 @@ bool DataTopicTests::initPublisher()
bool DataTopicTests::write(const ExerciseManagement::Exercise &data)
{
INFO_LOG(m_logger) << "Publish topic Exercise ";
DEBUG_LOG(m_logger) << "ExeId: " << data.id() << ", state: " << data.state()
INFO_LOG() << "Publish topic Exercise ";
DEBUG_LOG() << "ExeId: " << data.id() << ", state: " << data.state()
<< ", partitionName: " << data.partitionName();
return m_dtsExercise->write(data);
@@ -105,7 +105,7 @@ bool DataTopicTests::write(const ExerciseManagement::Exercise &data)
bool DataTopicTests::initSubscriber()
{
DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
m_domainParticipantSub =
dds::domain::DomainParticipant(m_domainId,
@@ -126,7 +126,7 @@ bool DataTopicTests::initSubscriber()
partitionQos.name( partitions );
subscriberQos << partitionQos;
DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener";
DEBUG_LOG() << "Initialise DTC::SubscriberListener";
m_subscriberListener = new DDSGeneric::SubscriberListener();
m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub,
@@ -145,11 +145,11 @@ bool DataTopicTests::initSubscriber()
void DataTopicTests::processData(const ExerciseManagement::Exercise &instance, DataModification modType)
{
Q_UNUSED(modType);
INFO_LOG(m_logger) << "process Lts_Exercise";
INFO_LOG() << "process Lts_Exercise";
DEBUG_LOG(m_logger) << "exerciseId: " << instance.id();
DEBUG_LOG(m_logger) << "name: " << instance.name();
DEBUG_LOG(m_logger) << "state: " << instance.state();
DEBUG_LOG() << "exerciseId: " << instance.id();
DEBUG_LOG() << "name: " << instance.name();
DEBUG_LOG() << "state: " << instance.state();
m_receivedExerciseData = instance;
@@ -67,8 +67,6 @@ private:
Qt::HANDLE m_mainThreadId;
// For returning TestData
ExerciseManagement::Exercise m_receivedExerciseData;
NGL::INGLLogger& m_logger;
};
@@ -40,7 +40,7 @@ DataTopicTestsMain::DataTopicTestsMain()
//-------------------------------------------------------------------------------------------------------
void DataTopicTestsMain::initTestCase()
{
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
m_dtTest = new DataTopicTests();
QVERIFY2(m_dtTest, "Initialisation of DataTopicTest failed");
@@ -53,7 +53,7 @@ void DataTopicTestsMain::initTestCase()
//-------------------------------------------------------------------------------------------------------
void DataTopicTestsMain::publishTestCase()
{
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish data";
DEBUG_LOG() <<"DataTopicTestsMain: publish data";
// Topic Exercise
m_sentExerciseData.id(222);
@@ -68,7 +68,7 @@ void DataTopicTestsMain::publishTestCase()
void DataTopicTestsMain::subscribeTestCase()
{
DEBUG_LOG(m_logger) << "IN subscribeTestCase";
DEBUG_LOG() << "IN subscribeTestCase";
QTRY_COMPARE(m_exerciseDataArrivedSpy->count(), 1);
ExerciseManagement::Exercise recvExercise = m_dtTest->getReceivedExerciseData();
@@ -82,7 +82,7 @@ void DataTopicTestsMain::subscribeTestCase()
//-------------------------------------------------------------------------------------------------------
void DataTopicTestsMain::cleanupTestCase()
{
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
delete m_dtTest; m_dtTest = nullptr;
delete m_exerciseDataArrivedSpy; m_exerciseDataArrivedSpy = nullptr;
}
@@ -39,8 +39,6 @@ private:
ExerciseManagement::Exercise m_sentExerciseData;
QSignalSpy *m_exerciseDataArrivedSpy = nullptr;
DataTopicTests *m_dtTest = nullptr;
NGL::INGLLogger &m_logger;
};
@@ -29,7 +29,7 @@ Initialisation::Initialisation()
//if (!defaultQos.setDefaultQos(QStringList("/shd/CTC/SV/.default_dds_profile.xml")))
if (!defaultQos.setDefaultQos())
ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
ERROR_LOG() << "Error setting default QoS from xml-file ";
}
@@ -62,7 +62,7 @@ bool Initialisation::initDDS(int domainId, int partitionId, PubSub pubsub)
{
dds::pub::qos::PublisherQos publisherQos = m_domainParticipant.default_publisher_qos();
DEBUG_LOG(m_logger) << "Publish on partition " << IDL::getPartitionString(partitionId);
DEBUG_LOG() << "Publish on partition " << IDL::getPartitionString(partitionId);
// use only selected partition
dds::core::policy::Partition partitionQos;
@@ -84,7 +84,7 @@ bool Initialisation::initDDS(int domainId, int partitionId, PubSub pubsub)
dds::sub::qos::SubscriberQos subscriberQos = domainPart.default_subscriber_qos();
DEBUG_LOG(m_logger) << "Subsribing on partition " << IDL::getPartitionString(partitionId);
DEBUG_LOG() << "Subsribing on partition " << IDL::getPartitionString(partitionId);
// use only selected partition
dds::core::policy::Partition partitionQos;
@@ -46,8 +46,6 @@ private:
dds::sub::Subscriber m_ddsSubscriber;
DTC::SubscriberListener *m_subListener;
NGL::INGLLogger &m_logger;
};