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
+8
-9
@@ -21,7 +21,6 @@ BiteHandler::BiteHandler(MainHandler *mainHandler)
|
||||
: QObject()
|
||||
, Interface::Fts::CallBiteRequestHandler(mainHandler->fts())
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_logger(getLogger("BiteHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -33,7 +32,7 @@ bool BiteHandler::init()
|
||||
void BiteHandler::onDemandBiteReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
if (replyObject.error())
|
||||
WARNING_LOG(m_logger) << "Got an demandBiteError: " << replyObject();
|
||||
WARNING_LOG() << "Got an demandBiteError: " << replyObject();
|
||||
|
||||
auto it = m_demandedBiteParticipantRequests.find(replyObject.id());
|
||||
if (it != m_demandedBiteParticipantRequests.end())
|
||||
@@ -46,17 +45,17 @@ void BiteHandler::onDemandBiteReply(const Core::FunctionReplyObject &replyObject
|
||||
m_demandedBiteParticipantRequests.erase(it);
|
||||
}
|
||||
else
|
||||
WARNING_LOG(m_logger) << "Bite request with request id " << replyObject.id() << " was not replied to by the proxy";
|
||||
WARNING_LOG() << "Bite request with request id " << replyObject.id() << " was not replied to by the proxy";
|
||||
}
|
||||
|
||||
void BiteHandler::onCallBiteRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CallBiteRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCallBiteRequest: " << request;
|
||||
DEBUG_LOG() << "onCallBiteRequest: " << request;
|
||||
auto ret = callBiteRequest(cookie, request);
|
||||
if (ret.error() || ret.id())
|
||||
{
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_mainHandler->fts()->callBiteReply(cookie, ret);
|
||||
}
|
||||
// delayed answer in non-error case
|
||||
@@ -76,7 +75,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
{
|
||||
if (m_demandedBiteParticipants.contains(participantId))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "demandBiteRequest for participant Id "
|
||||
DEBUG_LOG() << "demandBiteRequest for participant Id "
|
||||
<< participantId
|
||||
<< " already triggered - reply is still to be done";
|
||||
bAlreadyDemandedFound = true;
|
||||
@@ -86,12 +85,12 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
const ParticipantHandling::Participant *participant = m_mainHandler->participantHandler()->participantById(participantId);
|
||||
if (participant == nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got BITE request for non existing participant id " << participantId;
|
||||
WARNING_LOG() << "Got BITE request for non existing participant id " << participantId;
|
||||
continue;
|
||||
}
|
||||
if (participant->equipmentNumber() == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Got BITE request participant id " << participantId << " but has no equipment number set";
|
||||
WARNING_LOG() << "Got BITE request participant id " << participantId << " but has no equipment number set";
|
||||
continue;
|
||||
}
|
||||
bOneFound = true;
|
||||
@@ -135,7 +134,7 @@ Core::FunctionReplyObject BiteHandler::callBiteRequest(const rti::core::SampleId
|
||||
|
||||
void BiteHandler::onBiteRequestTimeout(int requestId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onBiteRequestTimeout for " << requestId;
|
||||
INFO_LOG() << "onBiteRequestTimeout for " << requestId;
|
||||
|
||||
onDemandBiteReply(Core::FunctionReplyObject(requestId, tr_lts("dds", "Timeout while waiting for the proxy")));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user