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
@@ -17,7 +17,7 @@
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include "logger.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <Trajectory/trajectory_generator.h>
|
||||
|
||||
@@ -169,7 +169,6 @@ class ObjectBase : public QObject
|
||||
MainHandler *m_mainHandler;
|
||||
bool m_bSupportsPausing; // can this entity be paused (e.g. artillery)
|
||||
QString m_typeName;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
@@ -205,7 +204,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
// check effect start for new elements if not OC
|
||||
if ((0 == m_data.id) && (isActivationTimeSet() && activationTime() < QDateTime::currentDateTimeUtc()) && !ignoreActivationTimeCheck)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "m_data.id : " << m_data.id << ", isActivationTimeSet :" << isActivationTimeSet()
|
||||
DEBUG_LOG() << "m_data.id : " << m_data.id << ", isActivationTimeSet :" << isActivationTimeSet()
|
||||
<< ", activationTime :" << activationTime().toMSecsSinceEpoch() << ", ignoreActivationTimeCheck :" << ignoreActivationTimeCheck;
|
||||
// << ", QDateTime::currentDateTimeUtc() :" << QDateTime::currentDateTimeUtc().msecsTo();
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Effect start is in the past."));
|
||||
@@ -332,7 +331,7 @@ template <typename T> class ObjectBaseTmpl : public ObjectBase
|
||||
|
||||
void onPublishData() override
|
||||
{
|
||||
DEBUG_LOG(m_logger) << id() << " Publishing data for " << m_typeName << " with name '" << m_data.name << "'"
|
||||
DEBUG_LOG() << id() << " Publishing data for " << m_typeName << " with name '" << m_data.name << "'"
|
||||
<< " isCentral=" << m_data.isCentral;
|
||||
ObjectBase::onPublishData();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user