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
@@ -486,13 +486,13 @@ void LtsDialog::showEvent(QShowEvent *event)
|
||||
|
||||
void LtsDialog::tryLockTopic()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (!m_topicInfo.isValid())
|
||||
return;
|
||||
|
||||
if (m_topicInfo.isLocked())
|
||||
{
|
||||
WARNING_LOG(m_logger) << LOGFUNCTION << " tried to lock with an already locked topic info, return";
|
||||
WARNING_LOG() << Q_FUNC_INFO << " tried to lock with an already locked topic info, return";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -508,7 +508,7 @@ void LtsDialog::tryLockTopic()
|
||||
|
||||
bool bIsConnected = isSignalConnected(QMetaMethod::fromSignal(&LtsDialog::signalLockTopic));
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION
|
||||
DEBUG_LOG() << Q_FUNC_INFO
|
||||
<< " signalLockTopic(): "
|
||||
<< ", TopicName =" << m_topicInfo.topicName()
|
||||
<< ", entity =" << m_topicInfo.entityId()
|
||||
@@ -520,7 +520,7 @@ void LtsDialog::tryLockTopic()
|
||||
|
||||
m_topicInfo.setLocked();
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
|
||||
@@ -535,14 +535,14 @@ void LtsDialog::initTopicLockHandler(const QString &topicName, int entityId)
|
||||
|
||||
void LtsDialog::tryLockTopicNew()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
tryLockTopic();
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START"
|
||||
<< ", topicName='" << topicName << "'"
|
||||
<< ", entityId=" << entityId;
|
||||
|
||||
@@ -550,7 +550,7 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
|
||||
if (m_topicInfo.entityId() != entityId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " topicName='" << topicName << "'"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " topicName='" << topicName << "'"
|
||||
<< " change from " << m_topicInfo.entityId() << " to " << entityId;
|
||||
m_topicInfo.setLocked(false);
|
||||
}
|
||||
@@ -561,16 +561,16 @@ void LtsDialog::tryLockTopicNew(const QString &topicName, int entityId)
|
||||
m_topicInfo.setValid();
|
||||
|
||||
tryLockTopic();
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END"
|
||||
<< ", topicName='" << topicName << "'"
|
||||
<< ", entityId=" << entityId;
|
||||
}
|
||||
|
||||
void LtsDialog::triggerTopicLock()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " !!trigger!!";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START" << " !!trigger!!";
|
||||
tryLockTopic();
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user