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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -26,7 +26,6 @@ ServiceManagement::ServiceHandler::ServiceHandler(const std::shared_ptr<DdsHandl
, m_heartBeatObserverTimer(new QTimer(this))
, m_ddsHandler(ddsHandler)
, m_licenceDonator(licenceDonator)
, m_logger(getLogger("ServiceHandler"))
{
connect(qApp, &QCoreApplication::aboutToQuit,
this, &ServiceHandler::stopAllServices);
@@ -40,17 +39,17 @@ ServiceManagement::ServiceHandler::~ServiceHandler()
bool ServiceManagement::ServiceHandler::init()
{
DEBUG_LOG(m_logger) << "Initializing ServiceHandler ...";
DEBUG_LOG() << "Initializing ServiceHandler ...";
connect(m_heartBeatObserverTimer, &QTimer::timeout,
this, &ServiceHandler::onHeartBeatObserverTimerTimeout);
HEARTBEAT_OBSERVER_INTERVAL = Settings::observerIntervall();
DEBUG_LOG(m_logger) << HEARTBEAT_OBSERVER_INTERVAL;
DEBUG_LOG() << HEARTBEAT_OBSERVER_INTERVAL;
m_heartBeatObserverTimer->start(HEARTBEAT_OBSERVER_INTERVAL);
DEBUG_LOG(m_logger) << "ServiceHandler successfully initialized.";
DEBUG_LOG() << "ServiceHandler successfully initialized.";
return true;
}
@@ -79,21 +78,21 @@ ServiceManagement::ServiceProcess *ServiceManagement::ServiceHandler::getProcess
void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core::SampleIdentity &cookie,
const RestartServiceRequest &request)
{
DEBUG_LOG(m_logger) << "onRestartServiceRequest " << request;
DEBUG_LOG() << "onRestartServiceRequest " << request;
ServiceProcess *proc = serviceProcessFromServiceProcId(request.id());
Core::FunctionReplyObject ret(request.id());
if (proc == nullptr)
{
INFO_LOG(m_logger) << "Got restart request for non existing service ID "
INFO_LOG() << "Got restart request for non existing service ID "
<< request.id();
ret.setStr(tr_lts("dds", "There is no ServiceProcess with id %1")).arg(request.id());
m_ddsHandler->fts()->restartServiceReply(cookie, ret);
return;
}
DEBUG_LOG(m_logger) << "Restart request for service "
DEBUG_LOG() << "Restart request for service "
<< proc->serviceName()
<< ", domain "
<< proc->domainId()
@@ -109,7 +108,7 @@ void ServiceManagement::ServiceHandler::onRestartServiceRequest(const rti::core:
void ServiceManagement::ServiceHandler::stopAllServices()
{
INFO_LOG(m_logger) << "Stopping all Services ...";
INFO_LOG() << "Stopping all Services ...";
// shutdown async
for (Service *service : std::as_const(m_services))
@@ -117,12 +116,12 @@ void ServiceManagement::ServiceHandler::stopAllServices()
for (Service *service : std::as_const(m_services))
service->waitForStopped();
INFO_LOG(m_logger) << "... all Services stopped :)";
INFO_LOG() << "... all Services stopped :)";
}
void ServiceManagement::ServiceHandler::onNewServiceInfoFromProc(const ServiceInformation &info)
{
TRACE_LOG(m_logger) << "Publishing new ServiceInformation: " << info;
TRACE_LOG() << "Publishing new ServiceInformation: " << info;
m_ddsHandler->dts()->publish(info);
@@ -134,11 +133,11 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
if (type == DataModification::eRemoved)
return;
TRACE_LOG(m_logger) << "Got new CurrentRunningState: " << data;
TRACE_LOG() << "Got new CurrentRunningState: " << data;
if (!data.pid())
{
INFO_LOG(m_logger) << "PID 0 is not allowed.";
INFO_LOG() << "PID 0 is not allowed.";
return;
}
@@ -154,7 +153,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
{
if (currentProc->remotePid() == data.pid())
{
DEBUG_LOG(m_logger) << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
DEBUG_LOG() << "Found my prog " << data.pid() << " to "<< currentProc->pid() << " " << currentProc->serviceName();
proc = currentProc;
retData.pid() = proc->processId();
found = true;
@@ -171,7 +170,7 @@ void ServiceManagement::ServiceHandler::onNewServiceInfoFromDds(const Core::Curr
{
if (!m_unknownPidsWarned.contains(data.pid()))
{
ERROR_LOG(m_logger) << "Got CurrentRunningState for non existing process with PID "
ERROR_LOG() << "Got CurrentRunningState for non existing process with PID "
<< data.pid();
m_unknownPidsWarned += data.pid();
}
@@ -239,7 +238,7 @@ void ServiceManagement::ServiceHandler::onHeartBeatObserverTimerTimeout()
if (currentProc->lastHeartbeatMSec() < minAge)
{
WARNING_LOG(m_logger) << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
WARNING_LOG() << "Heartbeat TIMEOUT for " << currentProc->debugInfo()
<< " - Restarting ..."
<< " min heartbeat age: " << QDateTime::fromMSecsSinceEpoch(minHeartbeatAge).toString(QStringLiteral("HH:mm:ss"));
currentProc->addStartAttempt();