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
+4
-5
@@ -19,7 +19,6 @@ namespace ExerciseManagement
|
||||
: QObject(parent)
|
||||
, m_exerciseState(ExerciseState::Unknown)
|
||||
, m_exercise(objExe)
|
||||
, m_logger(getLogger("ExerciseStateManager"))
|
||||
{
|
||||
m_stateSignals[ExerciseState::Unknown] = [&]() { emit stateUnknown(); };
|
||||
m_stateSignals[ExerciseState::Created] = [&]() { emit stateCreated(); };
|
||||
@@ -31,11 +30,11 @@ namespace ExerciseManagement
|
||||
|
||||
bool ExerciseStateManager::triggerSwitchState(ExerciseManagement::ExerciseState state)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Ex " << exerciseId() << ": Trying to switch to state " << toString(state);
|
||||
INFO_LOG() << "Ex " << exerciseId() << ": Trying to switch to state " << toString(state);
|
||||
std::function<void()> f = m_stateSignals.value(state);
|
||||
if (f)
|
||||
{
|
||||
//DEBUG_LOG(m_logger) << "function: emit signal";
|
||||
//DEBUG_LOG() << "function: emit signal";
|
||||
emit f();
|
||||
}
|
||||
return (f != nullptr);
|
||||
@@ -79,7 +78,7 @@ namespace ExerciseManagement
|
||||
|
||||
void ExerciseStateManager::setStateInternal(ExerciseManagement::ExerciseState state)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Ex " << exerciseId() << ": In setStateInternal: new state " << toString(state);
|
||||
INFO_LOG() << "Ex " << exerciseId() << ": In setStateInternal: new state " << toString(state);
|
||||
if(m_exerciseState == state)
|
||||
return;
|
||||
|
||||
@@ -97,7 +96,7 @@ namespace ExerciseManagement
|
||||
// or separate object (because we've to check the a/v state periodically etc)
|
||||
*/
|
||||
|
||||
INFO_LOG(m_logger) << "Ex " << exerciseId() << ": Changed exercise state to " << toString(state);
|
||||
INFO_LOG() << "Ex " << exerciseId() << ": Changed exercise state to " << toString(state);
|
||||
}
|
||||
|
||||
int ExerciseStateManager::exerciseId() const
|
||||
|
||||
Reference in new issue
Block a user