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
+7
-8
@@ -19,7 +19,6 @@ ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::EquipmentE
|
||||
, Interface::Fts::EquipmentSystemEventDataRequestHandler(mainHandler->fts())
|
||||
, m_mainHandler (mainHandler)
|
||||
, m_filterId(0)
|
||||
, m_logger(getLogger("EquipmentEventHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -27,13 +26,13 @@ bool ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::init(
|
||||
{
|
||||
if (!m_mainHandler->tabDtc()->enableEquipmentEvent())
|
||||
{
|
||||
ERROR_LOG (m_logger) << " TAB Dtc enableEquipmentEvent() failed !";
|
||||
ERROR_LOG() << " TAB Dtc enableEquipmentEvent() failed !";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_mainHandler->dts()->enableEquipmentSystemEventFtcReply())
|
||||
{
|
||||
ERROR_LOG (m_logger) << " Dts enableEquipmentSystemEventDataFtcReply() failed !";
|
||||
ERROR_LOG() << " Dts enableEquipmentSystemEventDataFtcReply() failed !";
|
||||
return false;
|
||||
}
|
||||
connect(m_mainHandler->tabDtc().get(), &TrainingAreaBase::Interface::Dtc::equipmentEventChanged, this, &EquipmentEventHandler::onEquipmentEventChanged);
|
||||
@@ -44,7 +43,7 @@ bool ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::init(
|
||||
void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEquipmentSystemEventDataRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ParticipantManagement::EquipmentSystemEventDataRequest &request)
|
||||
{
|
||||
INFO_LOG(m_logger) << "IN onEquipmentSystemEventDataRequest";
|
||||
INFO_LOG() << "IN onEquipmentSystemEventDataRequest";
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
@@ -59,13 +58,13 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
|
||||
if (request.deviceSpecificEventCode() > -1)
|
||||
stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode());
|
||||
|
||||
INFO_LOG(m_logger) << "stmt: " << stmt;
|
||||
INFO_LOG() << "stmt: " << stmt;
|
||||
|
||||
NSqlQuery q(m_mainHandler->db()->database());
|
||||
if (!q.exec(stmt))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error while selecting event-data ";
|
||||
ERROR_LOG(m_logger) << "stmt : " << stmt;
|
||||
ERROR_LOG() << "Error while selecting event-data ";
|
||||
ERROR_LOG() << "stmt : " << stmt;
|
||||
ret.setStr("Error while selecting data");
|
||||
m_mainHandler->fts()->equipmentSystemEventDataReply(cookie, ret);
|
||||
return;
|
||||
@@ -133,7 +132,7 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
|
||||
|
||||
if (!m_mainHandler->dts()->publish(event))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber() ;
|
||||
ERROR_LOG() << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber() ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user