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
+10
-11
@@ -44,7 +44,6 @@ ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId)
|
||||
, m_updateTimer(new QTimer(this))
|
||||
, m_lastSeenTimer(new QTimer(this))
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(getLogger("ExerciseHandler"))
|
||||
{
|
||||
m_updateTimer->setSingleShot(true);
|
||||
connect(m_updateTimer, &QTimer::timeout, this, &ExerciseHandler::onUpdateTimerTimeout);
|
||||
@@ -75,7 +74,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
|
||||
m_recordSession.type = avTypeRecordSession();
|
||||
if (!db()->insert(m_recordSession))
|
||||
{
|
||||
ERROR_LOG(m_logger) << m_exContext << " Error adding AvmDeviceConfig - aborting";
|
||||
ERROR_LOG() << m_exContext << " Error adding AvmDeviceConfig - aborting";
|
||||
return;
|
||||
}
|
||||
emit avDbReloadNeeded();
|
||||
@@ -89,7 +88,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
|
||||
m_replaySession.type = avTypePlaybackSession();
|
||||
if (!db()->insert(m_replaySession))
|
||||
{
|
||||
ERROR_LOG(m_logger) << m_exContext << " Error adding AvmDeviceConfig - aborting";
|
||||
ERROR_LOG() << m_exContext << " Error adding AvmDeviceConfig - aborting";
|
||||
return;
|
||||
}
|
||||
emit avDbReloadNeeded();
|
||||
@@ -99,7 +98,7 @@ void ExerciseHandler::checkForRecordPlaybackSession()
|
||||
void ExerciseHandler::setNewExerciseState(ExerciseManagement::ExerciseState newState)
|
||||
{
|
||||
Q_ASSERT(newState != ExerciseManagement::ExerciseState::Unknown);
|
||||
INFO_LOG(m_logger) << m_exContext << ": state change: " << m_curExerciseState << " -> " << newState;
|
||||
INFO_LOG() << m_exContext << ": state change: " << m_curExerciseState << " -> " << newState;
|
||||
|
||||
if (m_curExerciseState == newState)
|
||||
return;
|
||||
@@ -121,12 +120,12 @@ void ExerciseHandler::setNewExerciseState(ExerciseManagement::ExerciseState newS
|
||||
{
|
||||
if (newIsActive)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << m_exContext << " activated";
|
||||
DEBUG_LOG() << m_exContext << " activated";
|
||||
emit contextActivated();
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << m_exContext << " deactivated";
|
||||
DEBUG_LOG() << m_exContext << " deactivated";
|
||||
emit contextDeactivated();
|
||||
}
|
||||
}
|
||||
@@ -164,12 +163,12 @@ void ExerciseHandler::onUpdateTimerTimeout()
|
||||
if (m_curAVOperatingMode == desiredOperatingMode)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Context: " << m_exContext << " Try switching to " << desiredOperatingMode;
|
||||
DEBUG_LOG() << "Context: " << m_exContext << " Try switching to " << desiredOperatingMode;
|
||||
if (!avControl()->setOperatingModeForContext(m_exContext, desiredOperatingMode))
|
||||
{
|
||||
if (!m_bWarnedOnce)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Context: " << m_exContext
|
||||
DEBUG_LOG() << "Context: " << m_exContext
|
||||
<< " - could not change operating mode, maybe not yet connected to AVS - trying again in 5 seconds";
|
||||
m_bWarnedOnce = true;
|
||||
}
|
||||
@@ -206,7 +205,7 @@ void ExerciseHandler::onLastSeenTimerTimeout()
|
||||
m_lastSeen.lastSeen.isNull() ||
|
||||
m_lastSeen.lastSeen.addDays(1) < QDateTime::currentDateTimeUtc())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Exercise with id " << m_exContext.id()
|
||||
INFO_LOG() << "Exercise with id " << m_exContext.id()
|
||||
<< " not seen since more than 1 day -> removing";
|
||||
// not seen at all or not since more than 1 day -> remove
|
||||
setNewExerciseState(ExerciseManagement::ExerciseState::Terminated);
|
||||
@@ -225,13 +224,13 @@ void ExerciseHandler::onOperatingModeChanged(const ExerciseContext &context,
|
||||
|
||||
if (desiredOperatingMode != om)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Context: " << context << " Got " << om
|
||||
DEBUG_LOG() << "Context: " << context << " Got " << om
|
||||
<< " for " << comp << " but expected " << desiredOperatingMode;
|
||||
m_updateTimer->start(100);
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Context: " << context << " Got " << om
|
||||
DEBUG_LOG() << "Context: " << context << " Got " << om
|
||||
<< " for " << comp << " which is the expected value";
|
||||
m_updateTimer->stop();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user