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
+15
-16
@@ -26,7 +26,6 @@ FireAutomaton::FireAutomaton(QObject *parent)
|
||||
, m_intervalMSecs(0)
|
||||
, m_remainingTickMSecs(0)
|
||||
, m_state(State::Uninitialized)
|
||||
, m_logger(getLogger("Utils.FireAutomaton"))
|
||||
{
|
||||
m_timer.setSingleShot(true);
|
||||
connect(&m_timer, &QTimer::timeout, this, &FireAutomaton::nextTick, Qt::UniqueConnection);
|
||||
@@ -46,31 +45,31 @@ bool FireAutomaton::init(int32_t time, TimeType type, int32_t rounds, const QVec
|
||||
{
|
||||
if(m_state != State::Stopped && m_state != State::Uninitialized)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - fire automaton must be in state unitialized or stopped.";
|
||||
ERROR_LOG() << " init failed - fire automaton must be in state unitialized or stopped.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if(time < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - time invalid.";
|
||||
ERROR_LOG() << " init failed - time invalid.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if(effectorIds.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - effector Ids invalid.";
|
||||
ERROR_LOG() << " init failed - effector Ids invalid.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if(rounds <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - number of rounds invalid.";
|
||||
ERROR_LOG() << " init failed - number of rounds invalid.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if(pattern.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - invalid fire pattern.";
|
||||
ERROR_LOG() << " init failed - invalid fire pattern.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -81,13 +80,13 @@ bool FireAutomaton::init(int32_t time, TimeType type, int32_t rounds, const QVec
|
||||
|
||||
if(!readPattern(pattern))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - firing pattern invalid.";
|
||||
ERROR_LOG() << " init failed - firing pattern invalid.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!calculateSchedule(rounds))
|
||||
{
|
||||
ERROR_LOG(m_logger) << " init failed - firing schedule invalid.";
|
||||
ERROR_LOG() << " init failed - firing schedule invalid.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -167,7 +166,7 @@ bool FireAutomaton::start()
|
||||
{
|
||||
if(m_state != State::Stopped)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " start failed - fire automaton must be in state stopped.";
|
||||
ERROR_LOG() << " start failed - fire automaton must be in state stopped.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -188,7 +187,7 @@ bool FireAutomaton::resume()
|
||||
{
|
||||
if(m_state != State::Paused)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " resume failed - fire automaton must be in state paused.";
|
||||
ERROR_LOG() << " resume failed - fire automaton must be in state paused.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -208,7 +207,7 @@ bool FireAutomaton::pause()
|
||||
{
|
||||
if(m_state != State::Running)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " pause failed - fire automaton must be in state running.";
|
||||
ERROR_LOG() << " pause failed - fire automaton must be in state running.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -243,7 +242,7 @@ bool FireAutomaton::performStep()
|
||||
{
|
||||
if(m_state != State::Stopped && m_state != State::Stepping)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " performStep failed - fire automaton must be in state stepping or stopped.";
|
||||
ERROR_LOG() << " performStep failed - fire automaton must be in state stepping or stopped.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -279,7 +278,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
|
||||
|
||||
if(!patternElementFromString(element, patternElement))
|
||||
{
|
||||
WARNING_LOG(m_logger) << " skipped invalid firing pattern elements.";
|
||||
WARNING_LOG() << " skipped invalid firing pattern elements.";
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -291,7 +290,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << " a pattern may contain at most one fill element.";
|
||||
ERROR_LOG() << " a pattern may contain at most one fill element.";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -301,7 +300,7 @@ bool FireAutomaton::readPattern(const QString& pattern)
|
||||
|
||||
if(m_pattern.empty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << " error occured reading firing pattern.";
|
||||
ERROR_LOG() << " error occured reading firing pattern.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -413,7 +412,7 @@ bool FireAutomaton::calculateSchedule(int32_t rounds)
|
||||
|
||||
if(rounds > 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " scheduling error - fire pattern does not provide sufficient slots to schedule all rounds. " << rounds;
|
||||
ERROR_LOG() << " scheduling error - fire pattern does not provide sufficient slots to schedule all rounds. " << rounds;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user