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
+12
-13
@@ -23,7 +23,6 @@ HandlerSituationReplaySqlite::HandlerSituationReplaySqlite(const std::shared_ptr
|
||||
, m_partitionId(0)
|
||||
, m_beginTime(0)
|
||||
, m_endTime(0)
|
||||
, m_logger(getLogger("HandlerSituationReplaySqlite"))
|
||||
{}
|
||||
|
||||
HandlerSituationReplaySqlite::~HandlerSituationReplaySqlite()
|
||||
@@ -58,7 +57,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
|
||||
{
|
||||
delete m_objSrp;
|
||||
m_objSrp = nullptr;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return false;
|
||||
}
|
||||
connect(m_objSrp, &ObjectSituationReplay::replayTimeChanged, this, &HandlerSituationReplaySqlite::replayTimeChanged);
|
||||
@@ -71,7 +70,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
|
||||
|
||||
bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end, double pace)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
|
||||
DEBUG_LOG() << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
|
||||
|
||||
Database::SrpSituationReplay newData;
|
||||
newData.srpStateId = SrpState::Started;
|
||||
@@ -87,11 +86,11 @@ bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end
|
||||
|
||||
bool HandlerSituationReplaySqlite::onStopReplayRequest()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStopReplayRequest";
|
||||
DEBUG_LOG() << "onStopReplayRequest";
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onStopReplayRequest - internal error";
|
||||
ERROR_LOG() << "onStopReplayRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -100,7 +99,7 @@ bool HandlerSituationReplaySqlite::onStopReplayRequest()
|
||||
ret = m_objSrp->removeObject();
|
||||
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
|
||||
// remove all old data from DDS-Bus & clear maps
|
||||
m_dbReader->clearData();
|
||||
@@ -112,7 +111,7 @@ bool HandlerSituationReplaySqlite::onPauseReplayRequest()
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
return onChangeReplayStateRequest(SrpState::Paused, m_objSrp->pace());
|
||||
@@ -122,7 +121,7 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
return onChangeReplayStateRequest(SrpState::Resumed, m_objSrp->pace());
|
||||
@@ -131,17 +130,17 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
|
||||
|
||||
bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationReplay::SrpState &newState, double newPace)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << newState << ", " << newPace;
|
||||
DEBUG_LOG() << "onChangeReplayStateRequest: " << newState << ", " << newPace;
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newState != SrpState::Resumed && newState != SrpState::Paused)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
|
||||
ERROR_LOG() << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -149,7 +148,7 @@ bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationRep
|
||||
const Core::FunctionReplyObject ret = m_objSrp->switchToState(newState);
|
||||
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
|
||||
return !ret.error();
|
||||
}
|
||||
@@ -158,7 +157,7 @@ bool HandlerSituationReplaySqlite::onPaceChangeRequest(double newPace)
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user