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 @@ PreTests::PreTests(QObject *parent)
, m_testId(0)
, m_presentationId(0)
, m_bTestsSuccessful(true)
, m_logger(getLogger("Test"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
}
@@ -33,7 +32,7 @@ PreTests::PreTests(QObject *parent)
//----------------------------------------------------------------------------------
bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId)
{
INFO_LOG(m_logger) << "init begin";
INFO_LOG() << "init begin";
m_testId = testId;
m_exerciseId = exerciseId;
@@ -43,18 +42,18 @@ bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId
m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, m_exerciseId));
if (!m_ddsConnector->init())
return false;
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG(m_logger) << "create ftc PRE";
DEBUG_LOG() << "create ftc PRE";
m_ftc = PresentationManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init ftc PRE";
DEBUG_LOG() << "init ftc PRE";
bool bRet = m_ftc->enableAll();
DEBUG_LOG(m_logger) << "init end PRE - bRet = " << bRet;
DEBUG_LOG() << "init end PRE - bRet = " << bRet;
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
DEBUG_LOG(m_logger) << "Test Id = " << testId;
DEBUG_LOG() << "Domain Id = " << domainId;
DEBUG_LOG() << "Exercise Id = " << exerciseId;
DEBUG_LOG() << "Test Id = " << testId;
//TODO: add connects
@@ -64,7 +63,7 @@ bool PreTests::init(int domainId, int exerciseId, int testId, int presentationId
//----------------------------------------------------------------------------------
void PreTests::startTest()
{
INFO_LOG(m_logger) << "startTest";
INFO_LOG() << "startTest";
switch (m_testId)
{
case 1:
@@ -83,18 +82,18 @@ void PreTests::startTest()
tryChangeStatus();
break;
default:
ERROR_LOG(m_logger) << "Unknown test case !";
ERROR_LOG() << "Unknown test case !";
failExit();
break;
}
INFO_LOG(m_logger) << "********* endTest **************";
INFO_LOG() << "********* endTest **************";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
//----------------------------------------------------------------------------------
void PreTests::tryCreate()
{
INFO_LOG(m_logger) << "trying to send createRequest Presentation";
INFO_LOG() << "trying to send createRequest Presentation";
m_presentationId = -1;
PresentationModifyRequest request;
@@ -120,7 +119,7 @@ void PreTests::tryCreate()
if (!m_ftc->presentationModifyRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
@@ -151,10 +150,10 @@ void PreTests::tryModify()
vectorPc[1].duration(60);
vectorPc[1].startTime(QDateTime(QDate(2017,2,14), QTime(9,45)).toMSecsSinceEpoch());
INFO_LOG(m_logger) << "trying to send modify request for presentation Id = " << m_presentationId;
INFO_LOG() << "trying to send modify request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationModifyRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data";
ERROR_LOG() << "Error requesting modify data";
failExit();
}
@@ -168,10 +167,10 @@ void PreTests::tryDelete()
request.id(m_presentationId);
INFO_LOG(m_logger) << "trying to send delete request for presentation Id = " << m_presentationId;
INFO_LOG() << "trying to send delete request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationRemoveRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting delete data";
ERROR_LOG() << "Error requesting delete data";
failExit();
}
}
@@ -182,11 +181,11 @@ void PreTests::tryGetContent()
GetPresentationContentRequest request;
request.presentationId(m_presentationId);
INFO_LOG(m_logger) << "trying to send content request for presentation Id = " << m_presentationId;
INFO_LOG() << "trying to send content request for presentation Id = " << m_presentationId;
if (!m_ftc->getPresentationContentRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting content for presentationId: " << m_presentationId;
ERROR_LOG() << "Error requesting content for presentationId: " << m_presentationId;
failExit();
}
@@ -203,10 +202,10 @@ void PreTests::tryChangeStatus()
request.lastModified(QDateTime::currentMSecsSinceEpoch());
request.fileStatus(FileStatus::Deleted);
INFO_LOG(m_logger) << "trying to send change status request for presentation Id = " << m_presentationId;
INFO_LOG() << "trying to send change status request for presentation Id = " << m_presentationId;
if (!m_ftc->presentationChangeStatusRequest(request, this))
{
ERROR_LOG(m_logger) << "Error requesting change status";
ERROR_LOG() << "Error requesting change status";
failExit();
}
@@ -216,7 +215,7 @@ void PreTests::tryChangeStatus()
//----------------------------------------------------------------------------------
void PreTests::failExit()
{
ERROR_LOG(m_logger) << "FAIL EXIT !";
ERROR_LOG() << "FAIL EXIT !";
m_bTestsSuccessful = false;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -224,14 +223,14 @@ void PreTests::failExit()
//----------------------------------------------------------------------------------
void PreTests::onPresentationCreateReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger) << "END (onPresentationCreateReply)";
DEBUG_LOG() << "END (onPresentationCreateReply)";
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Got onPresentationCreateReply error: " << replyObject();
ERROR_LOG() << "Got onPresentationCreateReply error: " << replyObject();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
INFO_LOG() << "Got createReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_presentationId = replyObject.id();
@@ -246,15 +245,15 @@ void PreTests::onPresentationModifyReply(const Core::FunctionReplyObject &replyO
{
if (m_presentationId == -1)
return onPresentationCreateReply(replyObject);
DEBUG_LOG(m_logger) << "END (onPresentationModifyReply)";
DEBUG_LOG() << "END (onPresentationModifyReply)";
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Got onPresentationModifyReply error: " << replyObject();
ERROR_LOG() << "Got onPresentationModifyReply error: " << replyObject();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
INFO_LOG() << "Got createReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_presentationId = replyObject.id();
@@ -268,15 +267,15 @@ void PreTests::onPresentationModifyReply(const Core::FunctionReplyObject &replyO
//----------------------------------------------------------------------------------
void PreTests::onPresentationChangeStatusReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger) << "END (onPresentationChangeStatusReply)";
DEBUG_LOG() << "END (onPresentationChangeStatusReply)";
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Got onPresentationChangeStatusReply error: " << replyObject();
ERROR_LOG() << "Got onPresentationChangeStatusReply error: " << replyObject();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got changeStatusReply with id " << replyObject.id()
INFO_LOG() << "Got changeStatusReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_presentationId = replyObject.id();
@@ -290,16 +289,16 @@ void PreTests::onPresentationChangeStatusReply(const Core::FunctionReplyObject &
//----------------------------------------------------------------------------------
void PreTests::onPresentationRemoveReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger) << "END (onPresentationRemoveReply)";
DEBUG_LOG() << "END (onPresentationRemoveReply)";
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Got onPresentationRemoveReply error: " << replyObject();
ERROR_LOG() << "Got onPresentationRemoveReply error: " << replyObject();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
INFO_LOG() << "Got reply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -308,16 +307,16 @@ void PreTests::onPresentationRemoveReply(const Core::FunctionReplyObject &replyO
//----------------------------------------------------------------------------------
void PreTests::onGetPresentationContentReply(const GetPresentationContentReply &replyObject)
{
DEBUG_LOG(m_logger) << "END (onGetPresentationContentReply)";
DEBUG_LOG() << "END (onGetPresentationContentReply)";
if (replyObject.errorString().size() > 0)
{
ERROR_LOG(m_logger) << "Got onGetPresentationContentReply error: " << replyObject.errorString();
ERROR_LOG() << "Got onGetPresentationContentReply error: " << replyObject.errorString();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Got reply with id " << replyObject.id()
INFO_LOG() << "Got reply with id " << replyObject.id()
<< " and errorString " << replyObject.errorString()
<< " and content size " << replyObject.content().size();