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
@@ -23,7 +23,6 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare
|
||||
, m_stateManager(new ExerciseStateManager(objExe, this))
|
||||
, m_stateMachine(new QStateMachine(this))
|
||||
, m_exercise(objExe)
|
||||
, m_logger(getLogger("ExerciseStateMachine"))
|
||||
{
|
||||
qRegisterMetaType<ExerciseManagement::ExerciseState>("ExerciseManagement::ExerciseState");
|
||||
|
||||
@@ -80,12 +79,12 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare
|
||||
//States zur StateMachine hinzufügen
|
||||
for (ExerciseStateBase *state : std::as_const(m_exerciseStates))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": state: " << state->exerciseState();
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": state: " << state->exerciseState();
|
||||
m_stateMachine->addState(state);
|
||||
connect(state, &ExerciseStateBase::entered, this, &ExerciseStateMachine::onEnteredState);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
|
||||
}
|
||||
|
||||
ExerciseStateMachine::~ExerciseStateMachine()
|
||||
@@ -100,11 +99,11 @@ bool ExerciseStateMachine::init()
|
||||
if (m_stateMachine->isRunning())
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
|
||||
// initialise current exerciseState
|
||||
ExerciseStateBase *currentExerciseState = getStateFromId(m_exercise->exerciseState());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": State = "
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": State = "
|
||||
<< ExerciseStateManager::toString(m_exercise->exerciseState());
|
||||
|
||||
m_stateMachine->setInitialState(currentExerciseState);
|
||||
@@ -112,7 +111,7 @@ bool ExerciseStateMachine::init()
|
||||
|
||||
m_stateManager->setInitial(m_exercise->exerciseState());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -129,13 +128,13 @@ bool ExerciseStateMachine::switchToState(ExerciseState newExerciseState)
|
||||
|
||||
void ExerciseStateMachine::onEnteredState()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
|
||||
|
||||
ExerciseStateBase *s = qobject_cast<ExerciseStateBase*>(sender());
|
||||
if (!s)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
|
||||
|
||||
m_stateManager->setCurrent(s->exerciseState());
|
||||
|
||||
|
||||
Reference in new issue
Block a user