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
+16
-17
@@ -30,28 +30,27 @@ public:
|
||||
|
||||
HandlerTrajectory::HandlerTrajectory(MainHandler *mainHandler)
|
||||
: d(new Private)
|
||||
, m_logger(getLogger("HandlerTrajectory"))
|
||||
{
|
||||
d->m_mainHandler = mainHandler;
|
||||
}
|
||||
|
||||
HandlerTrajectory::~HandlerTrajectory()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
delete d;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
int HandlerTrajectory::create(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
int newId = -1;
|
||||
|
||||
auto *ifs = new ObjectTrajectory(d->m_mainHandler);
|
||||
if (!ifs)
|
||||
{
|
||||
ERROR_LOG(m_logger)<<" couldn't create ObjectTrajectory!";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
ERROR_LOG()<<" couldn't create ObjectTrajectory!";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -67,17 +66,17 @@ int HandlerTrajectory::create(const TrajectoryData &providedData)
|
||||
ifs->publish();
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, newId = " << newId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, newId = " << newId;
|
||||
return newId;
|
||||
}
|
||||
|
||||
bool HandlerTrajectory::update(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, id = " << providedData.id;
|
||||
bool success = false;
|
||||
if (!providedData.isIdValid())
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END ";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -88,25 +87,25 @@ bool HandlerTrajectory::update(const TrajectoryData &providedData)
|
||||
success = true;
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, success = " << success;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, success = " << success;
|
||||
return success;
|
||||
}
|
||||
|
||||
bool HandlerTrajectory::remove(const int trajId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << trajId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, id = " << trajId;
|
||||
|
||||
if (trajId <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " remove topic: got Invalid trajectory Id: "<<trajId;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
ERROR_LOG() << " remove topic: got Invalid trajectory Id: "<<trajId;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END ";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto *ifs = d->m_objectMap[trajId];
|
||||
if (!ifs->removeTopic())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "failed to remove trajectory with id " << trajId;
|
||||
ERROR_LOG() << "failed to remove trajectory with id " << trajId;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -114,13 +113,13 @@ bool HandlerTrajectory::remove(const int trajId)
|
||||
delete ifs;
|
||||
ifs = nullptr;
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END ";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END ";
|
||||
return true;
|
||||
}
|
||||
|
||||
int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id = " << providedData.id;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START, id = " << providedData.id;
|
||||
|
||||
int ret = -1;
|
||||
|
||||
@@ -131,7 +130,7 @@ int HandlerTrajectory::createUpdate(const TrajectoryData &providedData)
|
||||
} else {
|
||||
ret = create(providedData);
|
||||
}
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, id ret " << ret;
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END, id ret " << ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user