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
-5
@@ -37,7 +37,7 @@ void AvsCommandQueue::queue(std::unique_ptr<ICommand> cmd, std::unique_ptr<LtsUt
|
||||
|
||||
bool noPendingCommand = m_queue.empty();
|
||||
m_queue.push_back(CommandWithConn{std::move(cmd), std::move(connection)});
|
||||
DEBUG_LOG(m_logger) << "queueing command, queue size: " << m_queue.size();
|
||||
DEBUG_LOG() << "queueing command, queue size: " << m_queue.size();
|
||||
tryReduce();
|
||||
if (noPendingCommand)
|
||||
nextCommand();
|
||||
@@ -48,7 +48,7 @@ void AvsCommandQueue::done()
|
||||
Q_ASSERT(!m_queue.empty());
|
||||
m_timer.stop();
|
||||
m_queue.pop_front();
|
||||
DEBUG_LOG(m_logger) << "command finished, queue size: " << m_queue.size();
|
||||
DEBUG_LOG() << "command finished, queue size: " << m_queue.size();
|
||||
if (m_queue.empty())
|
||||
emit queueEmpty();
|
||||
else
|
||||
@@ -79,7 +79,7 @@ void AvsCommandQueue::flush()
|
||||
if (m_queue.empty())
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "flushing " << m_queue.size() << " commands";
|
||||
DEBUG_LOG() << "flushing " << m_queue.size() << " commands";
|
||||
m_timer.stop();
|
||||
m_queue.clear();
|
||||
emit queueEmpty();
|
||||
@@ -95,7 +95,7 @@ void AvsCommandQueue::nextCommand()
|
||||
{
|
||||
Q_ASSERT(!m_queue.empty());
|
||||
|
||||
DEBUG_LOG(m_logger) << "sending next command";
|
||||
DEBUG_LOG() << "sending next command";
|
||||
ICommand *cmd = currentCommand();
|
||||
m_timer.start();
|
||||
cmd->send();
|
||||
@@ -124,7 +124,7 @@ void AvsCommandQueue::tryReduce()
|
||||
if (!lastCommand.cmd->nullifies(current.cmd.get()))
|
||||
continue;
|
||||
|
||||
DEBUG_LOG(m_logger) << "dropping command due to override";
|
||||
DEBUG_LOG() << "dropping command due to override";
|
||||
m_queue.erase(m_queue.begin() + i);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user