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
-11
@@ -37,7 +37,7 @@ public:
|
||||
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam);
|
||||
|
||||
if (!m_db->insert(deviceConfig))
|
||||
ERROR_LOG(m_logger) << "Error while inserting device config into database";
|
||||
ERROR_LOG() << "Error while inserting device config into database";
|
||||
|
||||
m_cache.insert(videoTeam.id(), deviceConfig);
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
deviceConfig.id = oldDeviceConfig.id;
|
||||
|
||||
if (!m_db->update(deviceConfig))
|
||||
ERROR_LOG(m_logger) << "Error while updating device config";
|
||||
ERROR_LOG() << "Error while updating device config";
|
||||
|
||||
m_cache[videoTeam.id()] = deviceConfig;
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
Q_ASSERT(found != m_cache.end());
|
||||
|
||||
if (!m_db->removeAvmDeviceConfig(found->id))
|
||||
ERROR_LOG(m_logger) << "Error while removing device config";
|
||||
ERROR_LOG() << "Error while removing device config";
|
||||
|
||||
m_cache.erase(found);
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -101,7 +101,6 @@ private:
|
||||
QMap<int32_t, Database::AvmDeviceConfig> m_cache; //!< <VideoTeam::id, Database::DeviceConfig>
|
||||
HandlerVideoTeam *m_handler;
|
||||
DatabaseInterface *m_db;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -112,7 +111,6 @@ HandlerVideoTeam::HandlerVideoTeam(Interface::Dts *dts, Interface::Fts *fts, Dat
|
||||
, m_fts(fts)
|
||||
, m_db(db)
|
||||
, m_activeExercises(activeExercises)
|
||||
, m_logger(getLogger("HandlerVideoTeam"))
|
||||
, m_deviceConfig(new DeviceConfig(this, db, m_logger))
|
||||
{
|
||||
Q_ASSERT(dts);
|
||||
@@ -139,7 +137,7 @@ bool HandlerVideoTeam::init()
|
||||
// read all VideoTeam Data from database
|
||||
if (!m_db->select(dataVec))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -152,7 +150,7 @@ bool HandlerVideoTeam::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
return false;
|
||||
}
|
||||
m_videoTeamObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -161,7 +159,7 @@ bool HandlerVideoTeam::init()
|
||||
m_deviceConfig->create(ddsData);
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
|
||||
DEBUG_LOG() << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -178,10 +176,10 @@ QMap<int, VideoTeam> HandlerVideoTeam::videoTeams() const
|
||||
void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const VideoTeamModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onVideoTeamModifyRequest: " << request;
|
||||
DEBUG_LOG() << "onVideoTeamModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_fts->videoTeamModifyReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -234,7 +232,7 @@ Core::FunctionReplyObject HandlerVideoTeam::videoTeamModifyRequest(const VideoTe
|
||||
ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id());
|
||||
DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
|
||||
DEBUG_LOG() << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
|
||||
|
||||
VideoTeam ddsData = convert(request, ifs->getData());
|
||||
if (needDeviceConfig(ddsData))
|
||||
|
||||
Reference in new issue
Block a user