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
+5
-5
@@ -28,7 +28,7 @@ HandlerEffector::HandlerEffector(AreaEffectSimulation::MainHandler *mainhandler,
|
||||
|
||||
bool HandlerEffector::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "HandlerEffector::init";
|
||||
DEBUG_LOG() << "HandlerEffector::init";
|
||||
|
||||
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantChanged,
|
||||
this, &HandlerEffector::onParticipantChanged);
|
||||
@@ -48,7 +48,7 @@ void HandlerEffector::createEffector(int participantId)
|
||||
{
|
||||
if (m_effectors.contains(participantId))
|
||||
return;
|
||||
DEBUG_LOG(m_logger)<<"createEffector participantId:" << participantId;
|
||||
DEBUG_LOG()<<"createEffector participantId:" << participantId;
|
||||
ObjectEffector* objectEffector = new ObjectEffector(m_mainHandler, this);
|
||||
objectEffector->init(participantId);
|
||||
|
||||
@@ -58,17 +58,17 @@ void HandlerEffector::createEffector(int participantId)
|
||||
// TODO Wird aufgerufen, wenn zur Laufzeit ein Effektor geloescht wird. (Topic?)
|
||||
void HandlerEffector::deleteEffector(int participantId)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"deleteEffector participantId:" << participantId;
|
||||
DEBUG_LOG()<<"deleteEffector participantId:" << participantId;
|
||||
delete m_effectors[participantId];
|
||||
m_effectors.remove(participantId);
|
||||
}
|
||||
|
||||
void HandlerEffector::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
|
||||
{
|
||||
//DEBUG_LOG(m_logger)<<"onParticipantChanged participantId:" << data.id();
|
||||
//DEBUG_LOG()<<"onParticipantChanged participantId:" << data.id();
|
||||
if (modType == DataModification::eRemoved)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "m_participantsOutsideMap.remove participantId: " << data.id();
|
||||
DEBUG_LOG() << "m_participantsOutsideMap.remove participantId: " << data.id();
|
||||
if (m_effectors.contains(data.id()))
|
||||
deleteEffector(data.id());
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user