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

@@ -26,7 +26,6 @@ ParticipantManagement::PpmTests::PpmTests(QObject *parent)
, m_equipmentId(-1)
, m_participantId(1)
, m_bTestsSuccessful(true)
, m_logger(getLogger("Test"))
{
}
@@ -38,7 +37,7 @@ ParticipantManagement::PpmTests::~PpmTests()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::startTest()
{
INFO_LOG(m_logger) << "********* startTest **************";
INFO_LOG() << "********* startTest **************";
switch (m_testId)
{
case 1:
@@ -84,14 +83,14 @@ void ParticipantManagement::PpmTests::startTest()
failExit();
break;
}
INFO_LOG(m_logger) << "********* endTest **************";
INFO_LOG() << "********* endTest **************";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
//--------------------------------------------------------------------------------
bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int testId, int partyId, int typeId, int equipmentId, int participantId)
{
INFO_LOG(m_logger) << "init begin";
INFO_LOG() << "init begin";
m_testId = testId;
m_partyId = partyId;
@@ -108,22 +107,22 @@ bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int tes
return false;
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG(m_logger) << "create DTC PPM";
DEBUG_LOG() << "create DTC PPM";
m_dtc = ParticipantManagement::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init DTC PPM";
DEBUG_LOG() << "init DTC PPM";
bool bRet = m_dtc->enableAll();
DEBUG_LOG(m_logger) << "create FTC PPM";
DEBUG_LOG() << "create FTC PPM";
m_ftc = ParticipantManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init FTC PPM";
DEBUG_LOG() << "init FTC PPM";
bRet &= m_ftc->enableAll();
DEBUG_LOG(m_logger) << "init end PPM - bRet = " << bRet;
DEBUG_LOG() << "init end PPM - bRet = " << bRet;
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
DEBUG_LOG(m_logger) << "Test Id = " << testId;
DEBUG_LOG(m_logger) << "Party Id = " << partyId;
DEBUG_LOG(m_logger) << "Type Id = " << typeId;
DEBUG_LOG(m_logger) << "Equipment Id = " << equipmentId;
DEBUG_LOG() << "Domain Id = " << domainId;
DEBUG_LOG() << "Test Id = " << testId;
DEBUG_LOG() << "Party Id = " << partyId;
DEBUG_LOG() << "Type Id = " << typeId;
DEBUG_LOG() << "Equipment Id = " << equipmentId;
return bRet;
}
@@ -131,7 +130,7 @@ bool ParticipantManagement::PpmTests::init(int domainId, int exerciseId, int tes
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryCreateTemplate()
{
INFO_LOG(m_logger) << "Trying to send Create Template";
INFO_LOG() << "Trying to send Create Template";
std::vector<ParticipantManagement::TemplateData> data;
@@ -149,13 +148,13 @@ void ParticipantManagement::PpmTests::tryCreateTemplate()
m_dtc->waitForHistoricalDataTemplateParticipant();
ParticipantManagement::TemplateParticipant tp = m_dtc->templateParticipant(1);
const ParticipantManagement::TemplateData tdSup(m_dtc->convertFromParticipantTemplateToTemplateData(tp));
DEBUG_LOG(m_logger) << "SuperiorModId: " << tdSup.modId();
DEBUG_LOG() << "SuperiorModId: " << tdSup.modId();
data.push_back(tdSup);
if (!m_ftc->modifyTemplateDataRequest(ModifyTemplateDataRequest(data),this))
{
ERROR_LOG(m_logger) << "Error creating template data";
ERROR_LOG() << "Error creating template data";
failExit();
}
QTest::qWait(1000);
@@ -165,7 +164,7 @@ void ParticipantManagement::PpmTests::tryCreateTemplate()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryCreateParticipant()
{
INFO_LOG(m_logger) << "Trying to send Create ParticipantData per ModifyParticipantData";
INFO_LOG() << "Trying to send Create ParticipantData per ModifyParticipantData";
ParticipantManagement::ParticipantData ptd;
ptd.modId(1);
@@ -183,7 +182,7 @@ void ParticipantManagement::PpmTests::tryCreateParticipant()
if (!m_ftc->modifyParticipantDataRequest(req,this))
{
ERROR_LOG(m_logger) << "Error creating participant data";
ERROR_LOG() << "Error creating participant data";
failExit();
}
QTest::qWait(1000);
@@ -193,7 +192,7 @@ void ParticipantManagement::PpmTests::tryCreateParticipant()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
{
INFO_LOG(m_logger) << "Trying to send update info per registerForParticantRequest";
INFO_LOG() << "Trying to send update info per registerForParticantRequest";
ParticipantManagement::RegisterParticipantRequest rpr;
rpr.participantId(m_participantId);
@@ -204,7 +203,7 @@ void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
if (!m_ftc->registerParticipantRequest(rpr,this))
{
ERROR_LOG(m_logger) << "Error updating info/identification for participant";
ERROR_LOG() << "Error updating info/identification for participant";
failExit();
}
QTest::qWait(1000);
@@ -213,7 +212,7 @@ void ParticipantManagement::PpmTests::tryUpdateInfoParticipant()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryRegisterParticipant()
{
INFO_LOG(m_logger) << "Trying to send registerForParticantRequest";
INFO_LOG() << "Trying to send registerForParticantRequest";
ParticipantManagement::RegisterParticipantRequest rpr;
rpr.participantId(m_participantId);
@@ -224,7 +223,7 @@ void ParticipantManagement::PpmTests::tryRegisterParticipant()
if (!m_ftc->registerParticipantRequest(rpr,this))
{
ERROR_LOG(m_logger) << "Error updating info/identification for participant";
ERROR_LOG() << "Error updating info/identification for participant";
failExit();
}
QTest::qWait(1000);
@@ -233,7 +232,7 @@ void ParticipantManagement::PpmTests::tryRegisterParticipant()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryCreateParty()
{
INFO_LOG(m_logger) << "Trying to Create Party per ModifyPartyData";
INFO_LOG() << "Trying to Create Party per ModifyPartyData";
ParticipantManagement::Party party;
@@ -252,7 +251,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
if (!m_ftc->modifyPartyDataRequest(req, this))
{
ERROR_LOG(m_logger) << "Error creating party data";
ERROR_LOG() << "Error creating party data";
failExit();
}
@@ -270,7 +269,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
if (!m_ftc->modifyPartyDataRequest(req, this))
{
ERROR_LOG(m_logger) << "Error creating party data";
ERROR_LOG() << "Error creating party data";
failExit();
}
@@ -288,7 +287,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
if (!m_ftc->modifyPartyDataRequest(req, this))
{
ERROR_LOG(m_logger) << "Error creating party data";
ERROR_LOG() << "Error creating party data";
failExit();
}
@@ -306,7 +305,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
if (!m_ftc->modifyPartyDataRequest(req, this))
{
ERROR_LOG(m_logger) << "Error creating party data";
ERROR_LOG() << "Error creating party data";
failExit();
}
@@ -317,7 +316,7 @@ void ParticipantManagement::PpmTests::tryCreateParty()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryModifyParty()
{
INFO_LOG(m_logger) << "Trying to send Modify PartyData per ModifyPartyData";
INFO_LOG() << "Trying to send Modify PartyData per ModifyPartyData";
ParticipantManagement::Party party;
@@ -325,7 +324,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
party = m_dtc->party(m_partyId);
if (party.id() < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
ERROR_LOG() << "Party not found: id = " << m_partyId;
failExit();
}
@@ -339,7 +338,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
if (!m_ftc->modifyPartyDataRequest(req, this))
{
ERROR_LOG(m_logger) << "Error modifying party data";
ERROR_LOG() << "Error modifying party data";
failExit();
}
@@ -349,7 +348,7 @@ void ParticipantManagement::PpmTests::tryModifyParty()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryRemoveParty()
{
INFO_LOG(m_logger) << "Trying to send RemoveParty";
INFO_LOG() << "Trying to send RemoveParty";
ParticipantManagement::Party party;
@@ -357,7 +356,7 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
party = m_dtc->party(m_partyId);
if (party.id() < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
ERROR_LOG() << "Party not found: id = " << m_partyId;
failExit();
}
@@ -368,12 +367,12 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
{
if (party.isUsedBy())
{
INFO_LOG(m_logger) << "Not possible to delete used party!" ;
INFO_LOG() << "Not possible to delete used party!" ;
successExit();
}
else
{
ERROR_LOG(m_logger) << "Failed to delete not used party with id " << m_partyId;
ERROR_LOG() << "Failed to delete not used party with id " << m_partyId;
failExit();
}
}
@@ -384,14 +383,14 @@ void ParticipantManagement::PpmTests::tryRemoveParty()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::trySyncParties()
{
INFO_LOG(m_logger) << "Trying to sync parties with Ex 0";
INFO_LOG() << "Trying to sync parties with Ex 0";
SyncPartiesRequest req;
req.exerciseId(42);
if (!m_ftc->syncPartiesRequest(req, this))
{
ERROR_LOG(m_logger) << "Error sync parties";
ERROR_LOG() << "Error sync parties";
failExit();
}
@@ -401,7 +400,7 @@ void ParticipantManagement::PpmTests::trySyncParties()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryChangeUsed()
{
INFO_LOG(m_logger) << "Trying to send change used";
INFO_LOG() << "Trying to send change used";
ParticipantManagement::Party party;
@@ -409,7 +408,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
party = m_dtc->party(m_partyId);
if (party.id() < 0)
{
ERROR_LOG(m_logger) << "Party not found: id = " << m_partyId;
ERROR_LOG() << "Party not found: id = " << m_partyId;
failExit();
}
@@ -419,7 +418,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
if (!m_ftc->changePartyUsedStateRequest(req, this))
{
ERROR_LOG(m_logger) << "Error modifying used party";
ERROR_LOG() << "Error modifying used party";
failExit();
}
@@ -430,7 +429,7 @@ void ParticipantManagement::PpmTests::tryChangeUsed()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryCreateEquipmentType()
{
INFO_LOG(m_logger) << "Trying to send Create EquipmentType per ModifyEquipmentTypeDataRequest";
INFO_LOG() << "Trying to send Create EquipmentType per ModifyEquipmentTypeDataRequest";
ParticipantManagement::EquipmentType etd;
etd.id(1);
@@ -447,7 +446,7 @@ void ParticipantManagement::PpmTests::tryCreateEquipmentType()
if (!m_ftc->modifyEquipmentTypeDataRequest(ModifyEquipmentTypeDataRequest(data, false),this))
{
ERROR_LOG(m_logger) << "Error creating equipment type data";
ERROR_LOG() << "Error creating equipment type data";
failExit();
}
QTest::qWait(1000);
@@ -457,7 +456,7 @@ void ParticipantManagement::PpmTests::tryCreateEquipmentType()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryCreateType()
{
INFO_LOG(m_logger) << "Trying to send CreateTypeRequest";
INFO_LOG() << "Trying to send CreateTypeRequest";
if (!m_ftc->modifyTypeRequest(Type(0,
ParticipantManagement::TypeClass::SupportEntity,
@@ -470,7 +469,7 @@ void ParticipantManagement::PpmTests::tryCreateType()
{}, std::string()),
this))
{
ERROR_LOG(m_logger) << "Error creating type data";
ERROR_LOG() << "Error creating type data";
failExit();
}
@@ -480,7 +479,7 @@ void ParticipantManagement::PpmTests::tryCreateType()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryModifyType()
{
INFO_LOG(m_logger) << "Trying to send ModifyTypeRequest";
INFO_LOG() << "Trying to send ModifyTypeRequest";
if (!m_ftc->modifyTypeRequest(Type(m_typeId,
ParticipantManagement::TypeClass::SupportEntity,
@@ -493,7 +492,7 @@ void ParticipantManagement::PpmTests::tryModifyType()
{}, std::string()),
this))
{
ERROR_LOG(m_logger) << "Error modifying type data";
ERROR_LOG() << "Error modifying type data";
failExit();
}
QTest::qWait(1000);
@@ -502,11 +501,11 @@ void ParticipantManagement::PpmTests::tryModifyType()
//--------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::tryRemoveType()
{
INFO_LOG(m_logger) << "Trying to send RemoveTypeRequest";
INFO_LOG() << "Trying to send RemoveTypeRequest";
if (!m_ftc->removeTypeRequest(RemoveTypeRequest(m_typeId), this))
{
ERROR_LOG(m_logger) << "Error modifying type data";
ERROR_LOG() << "Error modifying type data";
failExit();
}
QTest::qWait(1000);
@@ -516,7 +515,7 @@ void ParticipantManagement::PpmTests::tryRemoveType()
// ------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::onError(const QString &reason)
{
ERROR_LOG(m_logger) << "Got Reply error: " << reason;
ERROR_LOG() << "Got Reply error: " << reason;
failExit();
}
@@ -528,7 +527,7 @@ void ParticipantManagement::PpmTests::onCreateReply(const Core::FunctionReplyObj
onError(replyObject.translated());
return;
}
INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
INFO_LOG() << "Got createReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -541,7 +540,7 @@ void ParticipantManagement::PpmTests::onModifyReply(const Core::FunctionReplyObj
onError(replyObject.translated());
return;
}
INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -554,7 +553,7 @@ void ParticipantManagement::PpmTests::onRemoveReply(const Core::FunctionReplyObj
onError(replyObject.translated());
return;
}
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
INFO_LOG() << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -567,7 +566,7 @@ void ParticipantManagement::PpmTests::onSyncPartiesReply(const Core::FunctionRep
onError(replyObject.translated());
return;
}
INFO_LOG(m_logger) << "Got syncParties with id " << replyObject.id()
INFO_LOG() << "Got syncParties with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -586,22 +585,22 @@ void ParticipantManagement::PpmTests::onRemovePartyReply(const Core::FunctionRep
onError(replyObject.translated());
return;
}
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
INFO_LOG() << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
void ParticipantManagement::PpmTests::onRegisterParticipantReply(const RegisterReply &reply)
{
ERROR_LOG(m_logger) << "onRegisterParticipantReply " << reply.errorString() << "exerciseId: " << reply.exerciseId();
ERROR_LOG() << "onRegisterParticipantReply " << reply.errorString() << "exerciseId: " << reply.exerciseId();
for ( std::string str : reply.errorParams())
ERROR_LOG(m_logger) << "error params: " << str;
ERROR_LOG() << "error params: " << str;
}
// ------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::failExit()
{
ERROR_LOG(m_logger) << "FAIL EXIT !";
ERROR_LOG() << "FAIL EXIT !";
m_bTestsSuccessful = false;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -609,7 +608,7 @@ void ParticipantManagement::PpmTests::failExit()
// ------------------------------------------------------------------------------
void ParticipantManagement::PpmTests::successExit()
{
INFO_LOG(m_logger) << "SUCCESS EXIT !";
INFO_LOG() << "SUCCESS EXIT !";
m_bTestsSuccessful = true;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}