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
@@ -24,7 +24,6 @@ HandlerPresentation::HandlerPresentation(Initialization *mainHandler)
|
||||
, Interface::Fts::GetPresentationContentRequestHandler(mainHandler->dds()->fts())
|
||||
, Interface::Fts::PresentationChangeStatusRequestHandler(mainHandler->dds()->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("HandlerPresentation"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -47,10 +46,10 @@ bool HandlerPresentation::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
|
||||
DEBUG_LOG() << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
|
||||
}
|
||||
|
||||
{
|
||||
@@ -60,7 +59,7 @@ bool HandlerPresentation::init()
|
||||
ObjectPresentation *objPre = m_objectPresentationMap.value(data.presentationId);
|
||||
if (!objPre || !objPre->isValid())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Cannot find presentation Id = " << data.presentationId
|
||||
WARNING_LOG() << "Cannot find presentation Id = " << data.presentationId
|
||||
<< " for presentationContent " << data.id;
|
||||
return;
|
||||
}
|
||||
@@ -68,7 +67,7 @@ bool HandlerPresentation::init()
|
||||
};
|
||||
if (!m_mainHandler->db()->select(cb))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -84,10 +83,10 @@ bool HandlerPresentation::init()
|
||||
void HandlerPresentation::onPresentationModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const PresentationModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onPresentationModifyRequest: " << request;
|
||||
DEBUG_LOG() << "onPresentationModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_mainHandler->dds()->fts()->presentationModifyReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -132,7 +131,7 @@ Core::FunctionReplyObject HandlerPresentation::presentationModifyRequest(const P
|
||||
void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onPresentationRemoveRequest: " << request;
|
||||
DEBUG_LOG() << "onPresentationRemoveRequest: " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
int presentationId = request.id();
|
||||
|
||||
@@ -152,10 +151,10 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Deleting presentation id = " << presentationId;
|
||||
DEBUG_LOG() << "Deleting presentation id = " << presentationId;
|
||||
ret = ifs->removeObject(); // removes all from db due to fk
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
|
||||
// delete ObjectPresentation (including Map)
|
||||
delete ifs;
|
||||
@@ -212,7 +211,7 @@ void HandlerPresentation::onPresentationChangeStatusRequest(const rti::core::Sam
|
||||
}
|
||||
Core::FunctionReplyObject ret = ifs->changeStatus(request);
|
||||
if (ret.error())
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
ERROR_LOG() << ret();
|
||||
|
||||
m_mainHandler->dds()->fts()->presentationChangeStatusReply(cookie, ret);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user