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
+3
-4
@@ -18,7 +18,6 @@ ObjectAesData::ObjectAesData(Initialization *mainHandler,
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("ObjectAesData"))
|
||||
{
|
||||
}
|
||||
//=============================================================================
|
||||
@@ -30,7 +29,7 @@ Core::FunctionReplyObject ObjectAesData::createObject(const Database::EsmAesData
|
||||
if (!m_mainHandler->db()->insert(m_data))
|
||||
return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error inserting EsmAesData into database."));
|
||||
|
||||
DEBUG_LOG(m_logger) << "New EsmAesData Id: " << m_data.idAes;
|
||||
DEBUG_LOG() << "New EsmAesData Id: " << m_data.idAes;
|
||||
return Core::FunctionReplyObject(m_data.idAes);
|
||||
}
|
||||
//=============================================================================
|
||||
@@ -41,7 +40,7 @@ Core::FunctionReplyObject ObjectAesData::updateObject(const Database::EsmAesData
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
return Core::FunctionReplyObject(m_data.idAes, tr_lts("dds", "Error updating EsmAesData into database"));
|
||||
|
||||
DEBUG_LOG(m_logger) << "Data changed for EsmAesData Id: " << m_data.idAes;
|
||||
DEBUG_LOG() << "Data changed for EsmAesData Id: " << m_data.idAes;
|
||||
|
||||
return Core::FunctionReplyObject(m_data.idAes);
|
||||
}
|
||||
@@ -73,7 +72,7 @@ bool ObjectAesData::dataChanged(const Database::EsmAesData &data) const
|
||||
if (m_data.nameAes != data.nameAes)
|
||||
return true;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Data Volley: " << data.volley << " old: " << m_data.volley;
|
||||
DEBUG_LOG() << "Data Volley: " << data.volley << " old: " << m_data.volley;
|
||||
return (m_data.chargeTypeId != data.chargeTypeId)
|
||||
|| (m_data.effectStart != data.effectStart)
|
||||
|| (m_data.effectStateId == AreaEffectSimulation::AesEffectState::EsFired)
|
||||
|
||||
Reference in new issue
Block a user