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
@@ -32,9 +32,8 @@ Connection::Connection(const dds::domain::DomainParticipant &domainParticipant,
|
||||
, m_topicsToRoute(topicsToRoute)
|
||||
, m_partition(partition)
|
||||
, m_description(desc)
|
||||
, m_logger(getLogger("Connection"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Create connection: " << partition
|
||||
INFO_LOG() << "Create connection: " << partition
|
||||
<< ", domain: " << domainParticipant.domain_id()
|
||||
<< ", direction: " << m_description
|
||||
<< " (" << this << ")";
|
||||
@@ -51,7 +50,7 @@ Connection::~Connection()
|
||||
}
|
||||
catch (const dds::core::Exception &ex)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "sub close ex: " << ex.what();
|
||||
ERROR_LOG() << "sub close ex: " << ex.what();
|
||||
}
|
||||
m_subscriber = nullptr;
|
||||
try
|
||||
@@ -61,7 +60,7 @@ Connection::~Connection()
|
||||
}
|
||||
catch (const dds::core::Exception &ex)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "pub close ex: " << ex.what();
|
||||
ERROR_LOG() << "pub close ex: " << ex.what();
|
||||
}
|
||||
m_publisher = nullptr;
|
||||
m_domainParticipant = nullptr;
|
||||
@@ -77,7 +76,7 @@ void Connection::setOutput(Connection *output)
|
||||
|
||||
bool Connection::initialize()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "initialize new connection for " << m_partition
|
||||
DEBUG_LOG() << "initialize new connection for " << m_partition
|
||||
<< ", direction: " << m_description
|
||||
<< " (" << this << ")";
|
||||
|
||||
@@ -88,7 +87,7 @@ bool Connection::initialize()
|
||||
|
||||
if (!m_output)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing connection for " << m_partition
|
||||
ERROR_LOG() << "Error initializing connection for " << m_partition
|
||||
<< ", direction: " << m_description << " - no output set!";
|
||||
return false;
|
||||
}
|
||||
@@ -104,7 +103,7 @@ void Connection::shutdown()
|
||||
QElapsedTimer timer;
|
||||
timer.start();
|
||||
|
||||
DEBUG_LOG(m_logger) << "shutting down connection for " << m_partition
|
||||
DEBUG_LOG() << "shutting down connection for " << m_partition
|
||||
<< ", direction: " << m_description
|
||||
<< " (" << this << "), dwt: " << m_dataWriterTask.get();
|
||||
|
||||
@@ -153,7 +152,7 @@ dds::sub::Subscriber Connection::subscriber() const
|
||||
|
||||
bool Connection::initTopics()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Init topics for " << m_partition
|
||||
DEBUG_LOG() << "Init topics for " << m_partition
|
||||
<< ", direction: " << m_description;
|
||||
|
||||
if (!m_output)
|
||||
|
||||
Reference in new issue
Block a user