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
+9
-10
@@ -14,7 +14,7 @@
|
||||
|
||||
// AES
|
||||
#include <AreaEffectSimulation/Utils/polygons.h>
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core.hpp>
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ static const int s_pauseTimeInSec = 5;
|
||||
ModuleTestLimits::ModuleTestLimits(int domainId, int exerciseId)
|
||||
: m_domainId(domainId)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(getLogger("ModuleTestLimits"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -597,7 +596,7 @@ bool ModuleTestLimits::waitForData(const std::function<bool ()> &func, int retry
|
||||
|
||||
for (int i = 0; i < retryCount; ++i)
|
||||
{
|
||||
TRACE_LOG(m_logger) << " waitForData - i: " << i;
|
||||
TRACE_LOG() << " waitForData - i: " << i;
|
||||
if (func())
|
||||
return true;
|
||||
QTest::qWait(100);
|
||||
@@ -861,14 +860,14 @@ void ModuleTestLimits::initTestCase()
|
||||
QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
|
||||
if (!bInit)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
|
||||
ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
|
||||
return;
|
||||
}
|
||||
INFO_LOG(m_logger) << " ddsConnector.init successfull";
|
||||
INFO_LOG() << " ddsConnector.init successfull";
|
||||
|
||||
// cmd
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
|
||||
INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
|
||||
|
||||
//
|
||||
// Aes
|
||||
@@ -1127,9 +1126,9 @@ void ModuleTestLimits::cleanupTestCase()
|
||||
// finish last (dds) calls:
|
||||
waitForData([]() { return false; }, 10);
|
||||
|
||||
INFO_LOG(m_logger) << " ddsConnector destroy...";
|
||||
INFO_LOG() << " ddsConnector destroy...";
|
||||
m_ddsConnector.reset();
|
||||
INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
|
||||
INFO_LOG() << " ddsConnector destroy...DONE";
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -1148,14 +1147,14 @@ void ModuleTestLimits::setupParticipant()
|
||||
req.onlyOutdatedParticipants(false);
|
||||
req.position(Core::GeoPosition(m_partPos.lon(), m_partPos.lat(), 0.0));
|
||||
|
||||
INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
|
||||
INFO_LOG() << " setSimulatedPositionRequest ...";
|
||||
m_replyError = true;
|
||||
m_ppmFtc->setSimulatedPositionRequest(req, this);
|
||||
|
||||
// expected condition:
|
||||
if (!waitForData([this]() { return !m_replyError; }))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error on request";
|
||||
ERROR_LOG() << "Error on request";
|
||||
}
|
||||
|
||||
QVERIFY2(m_replyError == false, "ERROR, setupParticipant failed");
|
||||
|
||||
+2
-5
@@ -224,9 +224,6 @@ private:
|
||||
}
|
||||
}
|
||||
m_counterDds;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
public:
|
||||
void onMineAreaModifyReply(const Core::FunctionReplyObject &reply) override { Q_UNUSED(reply);}
|
||||
void onExplosionAreaModifyReply(const Core::FunctionReplyObject &reply) override { Q_UNUSED(reply);}
|
||||
@@ -245,9 +242,9 @@ public:
|
||||
void onSetSimulatedPositionReply(const Core::FunctionReplyObject &reply) override
|
||||
{
|
||||
m_replyError = reply.error();
|
||||
DEBUG_LOG(m_logger) << " got reply - onSetSimulatedPositionReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onSetSimulatedPositionReply : " << m_replyError;
|
||||
if (!reply.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << reply.translated();
|
||||
ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << reply.translated();
|
||||
}
|
||||
|
||||
// ChargeAdministrationModifyReplyHandler interface
|
||||
|
||||
Reference in new issue
Block a user