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
+6
-8
@@ -18,14 +18,12 @@ namespace PresentationManagement
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
ObjectPresentation::ObjectPresentation(Initialization *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("ObjectPresentation"))
|
||||
{
|
||||
}
|
||||
|
||||
ObjectPresentation::ObjectPresentation(const Presentation &data, Initialization *mainHandler)
|
||||
: m_mainHandler(mainHandler)
|
||||
, m_data(data)
|
||||
, m_logger(getLogger("ObjectPresentation"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -81,12 +79,12 @@ Core::FunctionReplyObject ObjectPresentation::createObject(const PresentationMod
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting PresentationContent-data into database"));
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
|
||||
DEBUG_LOG() << "New presentation content id : " << conDbData.id;
|
||||
conData.id(conDbData.id);
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
|
||||
DEBUG_LOG() << "New Id: " << m_data.id();
|
||||
trans.commit();
|
||||
|
||||
onPublishData();
|
||||
@@ -116,9 +114,9 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
|
||||
for (const auto &content : std::as_const(m_content))
|
||||
{
|
||||
if (m_mainHandler->db()->removePrePresentationContent(content.id()))
|
||||
DEBUG_LOG(m_logger) << "Removed presentation content id " << content.id();
|
||||
DEBUG_LOG() << "Removed presentation content id " << content.id();
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Failed to remove presentation content id " << content.id();
|
||||
ERROR_LOG() << "Failed to remove presentation content id " << content.id();
|
||||
}
|
||||
|
||||
m_content = request.content();
|
||||
@@ -134,7 +132,7 @@ Core::FunctionReplyObject ObjectPresentation::updateObject(const PresentationMod
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting PresentationContent-data into database"));
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New presentation content id : " << conDbData.id;
|
||||
DEBUG_LOG() << "New presentation content id : " << conDbData.id;
|
||||
conData.id(conDbData.id);
|
||||
}
|
||||
|
||||
@@ -182,7 +180,7 @@ Core::FunctionReplyObject ObjectPresentation::changeStatus(const PresentationCha
|
||||
//------------------------------------------------------------------------------------------------------------
|
||||
void ObjectPresentation::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish Presentation-data to dds (" << m_data.id() << ") ...";
|
||||
INFO_LOG() << "Publish Presentation-data to dds (" << m_data.id() << ") ...";
|
||||
|
||||
m_mainHandler->dds()->dts()->publish(m_data);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user