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
@@ -15,7 +15,6 @@ AsmHandler::AsmHandler(QObject *parent)
|
||||
, m_dtcAsm(nullptr)
|
||||
, m_ftcAsm(nullptr)
|
||||
, m_exerciseId(-1)
|
||||
, m_logger(getLogger("AsmHandler"))
|
||||
{}
|
||||
|
||||
bool AsmHandler::init(MainDispatcher* mainDispatcher)
|
||||
@@ -26,7 +25,7 @@ bool AsmHandler::init(MainDispatcher* mainDispatcher)
|
||||
m_dtcAsm = AssetManagement::Interface::Dtc::create(mainDispatcher->ddsHandler()->ddsConnector());
|
||||
if (!m_dtcAsm->enableAsset())
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" Can't read data from ASM";
|
||||
ERROR_LOG()<<" Can't read data from ASM";
|
||||
return false;
|
||||
}
|
||||
m_exerciseId = mainDispatcher->exerciseId();
|
||||
@@ -38,7 +37,7 @@ bool AsmHandler::init(MainDispatcher* mainDispatcher)
|
||||
|
||||
void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
|
||||
{
|
||||
WARNING_LOG(m_logger)<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
|
||||
WARNING_LOG()<<">> modify asset properties: set exerciseId: "<<m_exerciseId<<" assetName: "<<assetId;
|
||||
|
||||
AssetManagement::Asset asset = m_dtcAsm->asset(assetId);
|
||||
if (asset.id() <= 0)
|
||||
@@ -52,7 +51,7 @@ void AsmHandler::modifyAssetAdlerProperties(int assetId, bool isSaaConnected)
|
||||
|
||||
void AsmHandler::onAssetModifyReply(const Core::FunctionReplyObject &reply)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got Function Reply error ? "<<reply.error();
|
||||
DEBUG_LOG() << "Got Function Reply error ? "<<reply.error();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user