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
+9
-10
@@ -29,7 +29,6 @@ HandlerExercisePhase::HandlerExercisePhase(MainHandler *mainHandler,
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("HandlerExercisePhase"))
|
||||
{}
|
||||
|
||||
HandlerExercisePhase::~HandlerExercisePhase()
|
||||
@@ -48,7 +47,7 @@ bool HandlerExercisePhase::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -56,11 +55,11 @@ bool HandlerExercisePhase::init()
|
||||
};
|
||||
if (!m_db->select(cbPhase) || !bRet)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
|
||||
DEBUG_LOG() << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -109,17 +108,17 @@ Core::FunctionReplyObject HandlerExercisePhase::removeAllPhasesByExerciseId(qint
|
||||
void HandlerExercisePhase::onExercisePhaseCreateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ExercisePhaseCreateRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseCreateRequest " << request;
|
||||
DEBUG_LOG() << "onExercisePhaseCreateRequest " << request;
|
||||
Core::FunctionReplyObject ret = exercisePhaseCreateRequest(request);
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
|
||||
m_ddsHandler->fts()->exercisePhaseCreateReply(cookie, ret);
|
||||
}
|
||||
|
||||
void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleIdentity &cookie, const ExercisePhaseModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseModifyRequest " << request;
|
||||
DEBUG_LOG() << "onExercisePhaseModifyRequest " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
|
||||
@@ -140,13 +139,13 @@ void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleI
|
||||
|
||||
ret = ifs->updateObject(data);
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
m_ddsHandler->fts()->exercisePhaseModifyReply(cookie, ret);
|
||||
}
|
||||
|
||||
void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseRemoveRequest " << request;
|
||||
DEBUG_LOG() << "onExercisePhaseRemoveRequest " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
|
||||
|
||||
@@ -179,7 +178,7 @@ void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleI
|
||||
ret = ifs->removeObject();
|
||||
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
else
|
||||
{
|
||||
// delete ObjectExercise (including ExerciseStateMachine)
|
||||
|
||||
Reference in new issue
Block a user