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
@@ -14,7 +14,6 @@ EffectShowExplosionCluster::EffectShowExplosionCluster(const AreaEffectSimulatio
|
||||
: m_explosionCluster(explosionCluster)
|
||||
, m_handlerPdmData(handlerPdmData)
|
||||
, m_numOfEffectShows(0)
|
||||
, m_logger(getLogger("EffectShowExplosionCluster"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -83,7 +82,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
|
||||
esmEffectShow.areaRotation = m_explosionCluster.area().rotation() + 90;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
|
||||
DEBUG_LOG() << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
|
||||
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
|
||||
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
|
||||
<< "\nOffset x,y: " << x_off << " , " << y_off
|
||||
@@ -120,7 +119,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
|
||||
esmEffectShow.areaDepth = m_explosionCluster.area().height();
|
||||
esmEffectShow.areaRotation = m_explosionCluster.area().rotation() + 90;
|
||||
|
||||
DEBUG_LOG(m_logger) << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
|
||||
DEBUG_LOG() << "\nWidth: " << m_explosionCluster.area().width() << " Height: " << m_explosionCluster.area().height()
|
||||
<< "\nRotated LL Pos: " << lowerLeftPosRotated.mgrs()
|
||||
<< "\nRotated Center Pos: " << centerPosRotated.mgrs()
|
||||
<< "\nSide x,y: " << m_explosionCluster.area().width() << " , " << m_explosionCluster.area().height();
|
||||
@@ -132,7 +131,7 @@ Database::EsmEffectShow EffectShowExplosionCluster::getEffectShow(int idx)
|
||||
void EffectShowExplosionCluster::updateEffectShow(Database::EsmEffectShow &data)
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "update EffectSHow for (" << data.id << ")";
|
||||
DEBUG_LOG() << "update EffectSHow for (" << data.id << ")";
|
||||
data.nameAreaEfffectSimulation = QString::fromStdString(m_explosionCluster.name());
|
||||
data.startTime = m_explosionCluster.effectStart().is_set() ? m_explosionCluster.effectStart().get() : 0;
|
||||
data.duration = m_explosionCluster.effectDuration();
|
||||
|
||||
Reference in new issue
Block a user