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

@@ -9,7 +9,6 @@ namespace WarehouseManagement
ExercisesHandler::ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler)
: m_ddsHandler(ddsHandler)
, m_logger(getLogger("ExercisesHandler"))
{}
ExercisesHandler::~ExercisesHandler()
@@ -33,7 +32,7 @@ bool ExercisesHandler::init()
QMap<qint32, ExerciseManagement::Exercise> ExercisesHandler::getExercises() const
{
INFO_LOG(m_logger) << "IN getExercises";
INFO_LOG() << "IN getExercises";
m_ddsHandler->exmDtc()->waitForHistoricalDataExercise();
return m_ddsHandler->exmDtc()->exercises();
}
@@ -63,7 +62,7 @@ ParticipantManagement::TypeClass ExercisesHandler::typeClassIdFromEquipmentTypeI
ParticipantManagement::Party ExercisesHandler::getParty(int partyId, int exerciseId) const
{
DEBUG_LOG(m_logger) << "getParty: " << partyId << ", exId: " << exerciseId;
DEBUG_LOG() << "getParty: " << partyId << ", exId: " << exerciseId;
auto it = m_exerciseHandler.find(exerciseId);
if (it == m_exerciseHandler.end())
return ParticipantManagement::Party();
@@ -151,7 +150,7 @@ bool ExercisesHandler::modifyEquipmentTypes(const std::vector<ParticipantManagem
void ExercisesHandler::onModifyEquipmentTypeDataReply(const Core::FunctionReplyObject &replyObject)
{
if (replyObject.error())
ERROR_LOG(m_logger) << replyObject();
ERROR_LOG() << replyObject();
}
bool ExercisesHandler::addParticipant(const ParticipantInfoStruct &pis)
@@ -165,7 +164,7 @@ bool ExercisesHandler::modifyParticipant(const ParticipantInfoStruct &pis)
auto it = findParticipant(pis);
if (it == m_participants.end())
{
ERROR_LOG(m_logger) << "Trying to modify a participant which is not in our map. mod: "
ERROR_LOG() << "Trying to modify a participant which is not in our map. mod: "
<< pis;
return false;
}
@@ -178,7 +177,7 @@ bool ExercisesHandler::removeParticipant(const ParticipantInfoStruct &pis)
auto it = findParticipant(pis);
if (it == m_participants.end())
{
ERROR_LOG(m_logger) << "Trying to remove a participant which is not in our map. mod: "
ERROR_LOG() << "Trying to remove a participant which is not in our map. mod: "
<< pis;
return false;
}
@@ -204,11 +203,11 @@ QVector<ParticipantInfoStruct> ExercisesHandler::infoStructForEquipment(int equi
void ExercisesHandler::exerciseAdded(int exerciseId)
{
INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " created";
INFO_LOG() << "Exercise with id " << exerciseId << " created";
auto it = m_exerciseHandler.find(exerciseId);
if (it != m_exerciseHandler.end())
{
WARNING_LOG(m_logger) << "Exercise with id " << exerciseId
WARNING_LOG() << "Exercise with id " << exerciseId
<< " added but it was already in our list - recreating handler";
delete it.value();
m_exerciseHandler.erase(it);
@@ -216,7 +215,7 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
ExerciseParticipantHandler *exH = new ExerciseParticipantHandler(m_ddsHandler->getDomainParticipant(), exerciseId, this);
if (!exH->init())
{
ERROR_LOG(m_logger) << "Error initializing ExerciseHandler for exercise " << exerciseId;
ERROR_LOG() << "Error initializing ExerciseHandler for exercise " << exerciseId;
delete exH;
return;
}
@@ -224,17 +223,17 @@ void ExercisesHandler::exerciseAdded(int exerciseId)
this, &ExercisesHandler::registrationReturnValue);
connect(exH, &ExerciseParticipantHandler::participantChanged,
this, &ExercisesHandler::participantChanged);
INFO_LOG(m_logger) << "Successfully created exercise handler for exercise " << exerciseId;
INFO_LOG() << "Successfully created exercise handler for exercise " << exerciseId;
m_exerciseHandler[exerciseId] = exH;
}
void ExercisesHandler::exerciseRemoved(int exerciseId)
{
INFO_LOG(m_logger) << "Exercise with id " << exerciseId << " removed";
INFO_LOG() << "Exercise with id " << exerciseId << " removed";
auto it = m_exerciseHandler.find(exerciseId);
if (it == m_exerciseHandler.end())
{
WARNING_LOG(m_logger) << "Exercise removed but it was not found in our internal map";
WARNING_LOG() << "Exercise removed but it was not found in our internal map";
return;
}
delete it.value();