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
+5
-6
@@ -17,7 +17,6 @@ ObjectVideoReceiver::ObjectVideoReceiver(Interface::Dts *dts,
|
||||
DatabaseInterface *db)
|
||||
: m_dts(dts)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("ObjectVideoReceiver"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -39,7 +38,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmVideoReceiver-data into database"));
|
||||
|
||||
m_data.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
|
||||
DEBUG_LOG() << "New Id: " << m_data.id();
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
@@ -52,7 +51,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver
|
||||
Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver &data)
|
||||
{
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id()
|
||||
DEBUG_LOG() << "ObjectVideoReceiver::updateObject id=" << data.id()
|
||||
<< " isActive=" << data.isActive()
|
||||
<< " hostName=" << data.hostName()
|
||||
<< " isLocked=" << data.isLocked();
|
||||
@@ -63,7 +62,7 @@ Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoReceiver2 into database"));
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id();
|
||||
DEBUG_LOG() << "Data changed for VideoReceiver Id: " << data.id();
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
@@ -86,10 +85,10 @@ Core::FunctionReplyObject ObjectVideoReceiver::removeObject()
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
void ObjectVideoReceiver::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ...";
|
||||
INFO_LOG() << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ...";
|
||||
|
||||
if (!m_dts->publish(m_data))
|
||||
ERROR_LOG(m_logger) << "Error publishing MvsVideoReceiver-data to dds";
|
||||
ERROR_LOG() << "Error publishing MvsVideoReceiver-data to dds";
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user