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

@@ -82,7 +82,7 @@ public:
DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
DEBUG_LOG() << Q_FUNC_INFO << " START"
<< ", domainId = " << domainId
<< ", domainIdReplay = " << domainIdReplay
<< ", tcpConnectionUrl = " << tcpConnectionUrl.toDisplayString()
@@ -107,7 +107,7 @@ public:
}
DEBUG_LOG(m_logger) << LOGFUNCTION << " idToUse = " << idToUse;
DEBUG_LOG() << Q_FUNC_INFO << " idToUse = " << idToUse;
@@ -120,7 +120,7 @@ public:
connect(repl.proc, &QProcess::errorOccurred,
this, [this, idToUse](const QProcess::ProcessError &error)
{
ERROR_LOG(m_logger) << "QProcess::ProcessError occured: "
ERROR_LOG() << "QProcess::ProcessError occured: "
<< ", idToUse = " << idToUse;
qCritical() << "QProcess::ProcessError: " << error;
} );
@@ -130,11 +130,11 @@ public:
connect(proc, &QProcess::readyReadStandardError, this, [this, idToUse, proc]()
{
DEBUG_LOG(m_logger) << "REPLAY #" << idToUse << " [!]: " << QString::fromUtf8(proc->readAllStandardError());
DEBUG_LOG() << "REPLAY #" << idToUse << " [!]: " << QString::fromUtf8(proc->readAllStandardError());
});
connect(proc, &QProcess::readyReadStandardOutput, this, [this, idToUse, proc]()
{
DEBUG_LOG(m_logger) << "REPLAY #" << idToUse << " [ ]: " << QString::fromUtf8(proc->readAllStandardOutput());
DEBUG_LOG() << "REPLAY #" << idToUse << " [ ]: " << QString::fromUtf8(proc->readAllStandardOutput());
});
repl.fi = nullptr;
@@ -158,9 +158,9 @@ public:
m_replayPartitions.insert(idToUse, repl);
DEBUG_LOG(m_logger) << LOGFUNCTION << " repl.proc->start()...";
DEBUG_LOG() << Q_FUNC_INFO << " repl.proc->start()...";
repl.proc->start();
DEBUG_LOG(m_logger) << LOGFUNCTION << " repl.proc->start()...DONE";
DEBUG_LOG() << Q_FUNC_INFO << " repl.proc->start()...DONE";
if (wait)
{
@@ -187,7 +187,7 @@ public:
NOTICE_LOG(m_logger) << " LtsUtils::awaitWithCancelationSignal ... DONE";
processStarted(proc, idToUse);
DEBUG_LOG(m_logger) << "Replay started: " << idToUse;
DEBUG_LOG() << "Replay started: " << idToUse;
return idToUse;
}
catch (const std::exception &ex)
@@ -207,7 +207,7 @@ public:
if (bIsStartedSuccessfully)
{
processStarted(proc, idToUse);
DEBUG_LOG(m_logger) << "Replay started: " << idToUse;
DEBUG_LOG() << "Replay started: " << idToUse;
return idToUse;
}
else
@@ -250,7 +250,7 @@ public:
if (proc->exitCode() != 0 || proc->exitStatus() != QProcess::NormalExit)
{
WARNING_LOG(m_logger) << "SituationReplay process exited with error: " << proc->exitCode()
WARNING_LOG() << "SituationReplay process exited with error: " << proc->exitCode()
<< ", status: " << proc->exitStatus()
<< ", stdout: " << proc->readAllStandardOutput()
<< ", stderr: " << proc->readAllStandardError();
@@ -270,7 +270,7 @@ public:
auto it = m_replayPartitions.find(replayId);
if (it == m_replayPartitions.end())
{
WARNING_LOG(m_logger) << "Got a processStarted signal from a process for replay " << replayId
WARNING_LOG() << "Got a processStarted signal from a process for replay " << replayId
<< " but found not corresponding entry in m_replayPartitions";
return;
}
@@ -323,7 +323,7 @@ public:
proc->kill();
const auto err(proc->readAllStandardError());
if (!err.isEmpty())
WARNING_LOG(m_logger) << "stderr: " << err;
WARNING_LOG() << "stderr: " << err;
delete proc;
};
@@ -332,12 +332,12 @@ public:
{
try
{
DEBUG_LOG(m_logger) << "Waiting for replay to process to shutdown... Replay id: " << rp.id();
DEBUG_LOG() << "Waiting for replay to process to shutdown... Replay id: " << rp.id();
LtsUtils::awaitTimeout(10000, rp.proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), true);
}
catch (...)
{
WARNING_LOG(m_logger) << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id();
WARNING_LOG() << "Timeout waiting for the replay process to quit gracefully - killing the process! Replay id: " << rp.id();
cb();
}
}
@@ -419,8 +419,6 @@ private:
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Interface::Dtc> m_dtc;
std::shared_ptr<DTS::ReplayPartition> m_replayPartion;
NGL::INGLLogger &m_logger;
};
@@ -450,7 +448,6 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ReplayHandler>
LtsSession::LtsSessionDataDds *session)
: m_replayHandler(replayHandler)
, m_session(session)
, m_logger(getLogger("ForeignInterfaceImpl"))
{
if (m_session->partitionType() == IDL::PartitionType::Exercise ||
m_session->partitionType() == IDL::PartitionType::Replay)