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:
2785 files changed
+18754
-18316
No files matched your search
+22
-22
@@ -38,9 +38,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()
|
||||
@@ -83,7 +83,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);
|
||||
|
||||
@@ -96,9 +96,9 @@ bool DataTopicTests::initPublisher()
|
||||
|
||||
bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish topic ServiceInformation ";
|
||||
INFO_LOG() << "Publish topic ServiceInformation ";
|
||||
|
||||
DEBUG_LOG(m_logger) << "Id: " << data.id()
|
||||
DEBUG_LOG() << "Id: " << data.id()
|
||||
<< ", Name: " << data.name()
|
||||
<< ", State: " << data.state()
|
||||
<< ", Timestamp: " << data.timestamp()
|
||||
@@ -110,7 +110,7 @@ bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
|
||||
|
||||
bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish topic GroupInformation ";
|
||||
INFO_LOG() << "Publish topic GroupInformation ";
|
||||
|
||||
if(m_logger.isDebugEnabled())
|
||||
{
|
||||
@@ -125,7 +125,7 @@ bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
|
||||
if(services.endsWith(QLatin1Char(',')))
|
||||
services.chop(1);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Type: " << data.type()
|
||||
DEBUG_LOG() << "Type: " << data.type()
|
||||
<< ", Domain: " << data.domainId()
|
||||
<< ", Partition: " << data.exercisePartitionId()
|
||||
<< ", Partition: " << data.replayPartitionId()
|
||||
@@ -149,13 +149,13 @@ ServiceManagement::GroupInformation DataTopicTests::getReceivedGroupInformationD
|
||||
void DataTopicTests::processData(const ServiceManagement::ServiceInformation &instance, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
INFO_LOG(m_logger) << "process Lts_ServiceInformation";
|
||||
INFO_LOG() << "process Lts_ServiceInformation";
|
||||
|
||||
DEBUG_LOG(m_logger) << "Id: " << instance.id();
|
||||
DEBUG_LOG(m_logger) << "Name: " << instance.name();
|
||||
DEBUG_LOG(m_logger) << "State: " << instance.state();
|
||||
DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG(m_logger) << "ErrorString: " << instance.errorString();
|
||||
DEBUG_LOG() << "Id: " << instance.id();
|
||||
DEBUG_LOG() << "Name: " << instance.name();
|
||||
DEBUG_LOG() << "State: " << instance.state();
|
||||
DEBUG_LOG() << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG() << "ErrorString: " << instance.errorString();
|
||||
|
||||
m_receivedServiceInformationData = instance;
|
||||
|
||||
@@ -167,7 +167,7 @@ void DataTopicTests::processData(const ServiceManagement::ServiceInformation &in
|
||||
void DataTopicTests::processData(const ServiceManagement::GroupInformation &instance, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
INFO_LOG(m_logger) << "process Lts_ServiceInformation";
|
||||
INFO_LOG() << "process Lts_ServiceInformation";
|
||||
|
||||
if(m_logger.isDebugEnabled())
|
||||
{
|
||||
@@ -182,12 +182,12 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
|
||||
if(services.endsWith(QLatin1Char(',')))
|
||||
services.chop(1);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Type: " << instance.type();
|
||||
DEBUG_LOG(m_logger) << "Domain: " << instance.domainId();
|
||||
DEBUG_LOG(m_logger) << "Partition: " << instance.exercisePartitionId();
|
||||
DEBUG_LOG(m_logger) << "Replay Partition: " << instance.replayPartitionId();
|
||||
DEBUG_LOG(m_logger) << "Services: " << services;
|
||||
DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG() << "Type: " << instance.type();
|
||||
DEBUG_LOG() << "Domain: " << instance.domainId();
|
||||
DEBUG_LOG() << "Partition: " << instance.exercisePartitionId();
|
||||
DEBUG_LOG() << "Replay Partition: " << instance.replayPartitionId();
|
||||
DEBUG_LOG() << "Services: " << services;
|
||||
DEBUG_LOG() << "Timestamp: " << instance.timestamp();
|
||||
}
|
||||
|
||||
m_receivedGroupInformationData = instance;
|
||||
@@ -203,7 +203,7 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
|
||||
|
||||
bool DataTopicTests::initSubscriber()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
|
||||
DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
|
||||
|
||||
m_domainParticipantSub =
|
||||
dds::domain::DomainParticipant(m_domainId,
|
||||
@@ -224,7 +224,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,
|
||||
|
||||
-2
@@ -73,8 +73,6 @@ private:
|
||||
// For returning TestData
|
||||
ServiceManagement::ServiceInformation m_receivedServiceInformationData;
|
||||
ServiceManagement::GroupInformation m_receivedGroupInformationData;
|
||||
|
||||
NGL::INGLLogger& m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+6
-6
@@ -38,7 +38,7 @@ DataTopicTestsMain::DataTopicTestsMain()
|
||||
|
||||
void DataTopicTestsMain::initTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
|
||||
|
||||
m_dtTest = new DataTopicTests();
|
||||
|
||||
@@ -52,7 +52,7 @@ void DataTopicTestsMain::initTestCase()
|
||||
|
||||
void DataTopicTestsMain::publishServiceInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish ServiceInformation data";
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: publish ServiceInformation data";
|
||||
|
||||
// Topic ServiceInformation
|
||||
m_sentServiceInformationData.id(13);
|
||||
@@ -66,7 +66,7 @@ void DataTopicTestsMain::publishServiceInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::subscribeServiceInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "IN subscribeServiceInformationTestCase";
|
||||
DEBUG_LOG() << "IN subscribeServiceInformationTestCase";
|
||||
|
||||
QTRY_COMPARE(m_serviceInformationDataArrivedSpy->count(), 1);
|
||||
|
||||
@@ -81,7 +81,7 @@ void DataTopicTestsMain::subscribeServiceInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::publishGroupInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DataTopicTestsMain: publish GroupInformation data";
|
||||
DEBUG_LOG() << "DataTopicTestsMain: publish GroupInformation data";
|
||||
|
||||
std::vector<int> services = {1, 3, 5, 7, 11, 13, 17, 19, 23, 42};
|
||||
|
||||
@@ -97,7 +97,7 @@ void DataTopicTestsMain::publishGroupInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::subscribeGroupInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "IN subscribeGroupInformationTestCase";
|
||||
DEBUG_LOG() << "IN subscribeGroupInformationTestCase";
|
||||
|
||||
QTRY_COMPARE(m_groupInformationDataArrivedSpy->count(), 1);
|
||||
|
||||
@@ -112,7 +112,7 @@ void DataTopicTestsMain::subscribeGroupInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::cleanupTestCase()
|
||||
{
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
|
||||
delete m_dtTest; m_dtTest = nullptr;
|
||||
delete m_serviceInformationDataArrivedSpy; m_serviceInformationDataArrivedSpy = nullptr;
|
||||
delete m_groupInformationDataArrivedSpy; m_groupInformationDataArrivedSpy = nullptr;
|
||||
|
||||
-1
@@ -41,5 +41,4 @@ private:
|
||||
QSignalSpy *m_serviceInformationDataArrivedSpy = nullptr;
|
||||
QSignalSpy *m_groupInformationDataArrivedSpy = nullptr;
|
||||
DataTopicTests *m_dtTest = nullptr;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
Reference in new issue
Block a user