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
+7
-8
@@ -13,7 +13,6 @@ namespace OcSituationServer
|
||||
|
||||
CentralAesDataQueue::CentralAesDataQueue(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("CentralAesDataQueue"))
|
||||
{
|
||||
|
||||
}
|
||||
@@ -36,7 +35,7 @@ void CentralAesDataQueue::addRemoveMessage(int32_t aesItemId, AreaEffectSimulati
|
||||
else
|
||||
m_internalQueue.prepend({aesItemId, OcSituation::Remove, data});
|
||||
|
||||
DEBUG_LOG(m_logger) << "New remove-message added: Id = " << aesItemId
|
||||
DEBUG_LOG() << "New remove-message added: Id = " << aesItemId
|
||||
<< ", aesType = " << aesType << ". "
|
||||
<< m_internalQueue.size() << " normal, "
|
||||
<< m_internalPrioritizedQueue.size() << " prioritized and "
|
||||
@@ -115,7 +114,7 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
|
||||
|
||||
++messageCounter;
|
||||
|
||||
WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
}
|
||||
|
||||
while (!m_internalQueue.isEmpty() && ((result.size() + m_internalQueue.head().data.size()) <= size))
|
||||
@@ -132,11 +131,11 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
|
||||
|
||||
++messageCounter;
|
||||
|
||||
WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
|
||||
DEBUG_LOG(m_logger) << messageCounter << " messages are sent. "
|
||||
DEBUG_LOG() << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
|
||||
DEBUG_LOG() << messageCounter << " messages are sent. "
|
||||
<< m_internalQueue.size() << " normal, "
|
||||
<< m_internalPrioritizedQueue.size() << " prioritized and "
|
||||
<< m_internalQueue.size() + m_internalPrioritizedQueue.size() << " remaining messages in total.";
|
||||
@@ -163,7 +162,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
|
||||
{
|
||||
m_internalQueue.removeAt(counter);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -175,7 +174,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
|
||||
{
|
||||
m_internalPrioritizedQueue.removeAt(counter);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user