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

@@ -18,7 +18,6 @@ namespace HighLevelArchitecture
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_exerciseId(0)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
@@ -29,7 +28,7 @@ MainHandler::~MainHandler()
bool MainHandler::init(int exerciseId)
{
NOTICE_LOG(m_logger) << LOGFUNCTION << ", exerciseId=" << exerciseId;
NOTICE_LOG(m_logger) << Q_FUNC_INFO << ", exerciseId=" << exerciseId;
m_exerciseId = 5;
IdentifierStruct::setOwnSiteId(exerciseId);
@@ -51,7 +50,7 @@ bool MainHandler::init(int exerciseId)
int port = 23456;
if (!m_wsInterface->init(port))
{
ERROR_LOG(m_logger) << LOGFUNCTION
ERROR_LOG() << Q_FUNC_INFO
<< " WsInterface::init failed on port: " << port;
return false;
}
@@ -30,6 +30,5 @@ private:
std::shared_ptr<NgsHandler> m_ngsHandler;
std::shared_ptr<WsInterface> m_wsInterface;
int m_exerciseId;
LOGGER_T m_logger;
};
}
@@ -151,7 +151,6 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler)
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this))
, m_logger(getLogger("NgsConnector"))
{
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
@@ -231,7 +230,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const ngs::NGSSimWorldException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (getIFederationMaster): " << e.print();
ERROR_LOG() << "caught exception during init (getIFederationMaster): " << e.print();
return false;
}
@@ -246,7 +245,7 @@ bool NgsConnector::initialize(ngs::IObserver::ProtocolType protocol, const QStri
}
catch (const NGSException &e)
{
ERROR_LOG(m_logger) << "caught exception during init (createFederation): " << e.print();
ERROR_LOG() << "caught exception during init (createFederation): " << e.print();
return false;
}
player = &m_swadmin->getIPlayer(m_fedName.toStdString(), playerName.toStdString(), *m_playerCallback, Settings::swConfFileName().toLatin1().data(), Settings::fomIdentifier().toStdString(), Settings::rtiIdentifier().toStdString());
@@ -296,27 +295,27 @@ void NgsConnector::subscribeAtNgs()
m_enitityNumberCounter = 1;
m_eventCount = 1;
INFO_LOG(m_logger) << "Subscribe at NGS - Guez Human Objects";
INFO_LOG() << "Subscribe at NGS - Guez Human Objects";
rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
humanObjClass.subscribeAllAttributes();
humanObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Guez ObserverController Objects";
INFO_LOG() << "Subscribe at NGS - Guez ObserverController Objects";
rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
observerControllerObjClass.subscribeAllAttributes();
observerControllerObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Guez GroundVehicle Objects";
INFO_LOG() << "Subscribe at NGS - Guez GroundVehicle Objects";
rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.subscribeAllAttributes();
groundVehicleObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Objects";
INFO_LOG() << "Subscribe at NGS - Guez MineField Objects";
rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
minefieldObjClass.subscribeAllAttributes();
minefieldObjClass.subscribe();
INFO_LOG(m_logger) << "Subscribe at NGS - Guez MineField Breach Objects";
INFO_LOG() << "Subscribe at NGS - Guez MineField Breach Objects";
rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
minefieldBreachObjClass.subscribeAllAttributes();
minefieldBreachObjClass.subscribe();
@@ -352,23 +351,23 @@ void NgsConnector::unsubscribeFromNgs()
if (m_somPlayer)
{
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez Human Objects";
INFO_LOG() << "Unsubscribe at NGS - Guez Human Objects";
rpr2::IObserverGuezHumanObjClass &humanObjClass = m_somPlayer->getObserverGuezHumanObjClass(*m_humanCallback);
humanObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez ObserverController Objects";
INFO_LOG() << "Unsubscribe at NGS - Guez ObserverController Objects";
rpr2::IObserverGuezObserverControllerObjClass &observerControllerObjClass = m_somPlayer->getObserverGuezObserverControllerObjClass(*m_observerControllerCallback);
observerControllerObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez GroundVehicle Objects";
INFO_LOG() << "Unsubscribe at NGS - Guez GroundVehicle Objects";
rpr2::IObserverGuezGroundVehicleObjClass &groundVehicleObjClass = m_somPlayer->getObserverGuezGroundVehicleObjClass(*m_groundVehicleCallback);
groundVehicleObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Objects";
INFO_LOG() << "Unsubscribe at NGS - Guez MineField Objects";
rpr2::IObserverGuezMineFieldObjClass &minefieldObjClass = m_somPlayer->getObserverGuezMineFieldObjClass(*m_minefieldCallback);
minefieldObjClass.unsubscribe();
INFO_LOG(m_logger) << "Unsubscribe at NGS - Guez MineField Breach Objects";
INFO_LOG() << "Unsubscribe at NGS - Guez MineField Breach Objects";
rpr2::IObserverGuezMineFieldBreachObjClass &minefieldBreachObjClass = m_somPlayer->getObserverGuezMineFieldBreachObjClass(*m_minefieldBreachCallback);
minefieldBreachObjClass.unsubscribe();
}
@@ -778,11 +777,11 @@ void NgsConnector::go()
}
catch (const NGSException &ex)
{
ERROR_LOG(m_logger) << "NGS Exception caught in Event Loop" << ex.print();
ERROR_LOG() << "NGS Exception caught in Event Loop" << ex.print();
}
catch (const std::exception &e)
{
ERROR_LOG(m_logger) << "Standard Exception caught in Event Loop: " << e.what();
ERROR_LOG() << "Standard Exception caught in Event Loop: " << e.what();
}
catch (...)
{
@@ -328,9 +328,7 @@ protected:
bool m_bInitialized;
bool m_bCanPublishData;
QTimer *m_timer;
NGL::INGLLogger &m_logger;
QTimer *m_timer;
static quint16 s_ownSiteId;
static quint16 s_ownApplicationId;
@@ -19,7 +19,6 @@ namespace HighLevelArchitecture
NgsHandler::NgsHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("NgsHandler"))
{}
NgsHandler::~NgsHandler()
@@ -37,7 +36,7 @@ bool NgsHandler::init()
if (myVec < myVec2)
{
INFO_LOG(m_logger) << "Protocol = ";
INFO_LOG() << "Protocol = ";
}
@@ -51,7 +50,7 @@ bool NgsHandler::init()
ngs::IObserver::ProtocolType protocol = Settings::hlaProtocol();
INFO_LOG(m_logger) << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
INFO_LOG() << "Protocol = " << protToStr.value(protocol, QStringLiteral("UNKNOWN"));
m_ngsConnector =
@@ -38,6 +38,5 @@ private slots:
void onFirstTickFinished();
private:
std::shared_ptr<NgsConnector> m_ngsConnector;
LOGGER_T m_logger;
};
}
@@ -25,39 +25,39 @@ WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent
, m_ngsHandler(ngsHandler)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("HlaTestTool.WsInterface"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
WsInterface::~WsInterface()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
for (auto client : std::as_const(m_clients))
{
client->disconnect(this);
client->close();
}
qDeleteAll(m_clients);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool WsInterface::init(quint16 listenPort)
{
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, listenPort=" << listenPort;
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, listenPort=" << listenPort;
if (!m_wsServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG(m_logger) << "Cannot listen on port " << listenPort << " - aborting";
WARNING_LOG() << "Cannot listen on port " << listenPort << " - aborting";
return false;
}
DEBUG_LOG(m_logger) << "Listening on port " << listenPort;
DEBUG_LOG() << "Listening on port " << listenPort;
connect(m_wsServer, &QWebSocketServer::newConnection,
this, &WsInterface::onNewConnection);
TRACE_LOG(m_logger) << LOGFUNCTION << " END, listenPort=" << listenPort;
TRACE_LOG() << Q_FUNC_INFO << " END, listenPort=" << listenPort;
return true;
}
@@ -79,48 +79,48 @@ void WsInterface::onNewConnection()
void WsInterface::onWebSocketDisconnected()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
QWebSocket *ws = qobject_cast<QWebSocket *>(sender());
if (!ws)
return;
NOTICE_LOG(m_logger) << "Websocket connection closed, ptr: " << ws;
m_clients.remove(ws);
ws->deleteLater();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
void WsInterface::onError(QAbstractSocket::SocketError error)
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Error occured, QAbstractSocket::SocketError = " << error;
ERROR_LOG() << Q_FUNC_INFO << " Error occured, QAbstractSocket::SocketError = " << error;
}
void WsInterface::onTextMessageReceived(const QString &msg)
{
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, msg='" << msg << "'";
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, msg='" << msg << "'";
if (msg.isEmpty())
{
ERROR_LOG(m_logger) << "Empty message received";
ERROR_LOG() << "Empty message received";
return;
}
DEBUG_LOG(m_logger) << "incoming telegram: " << msg;
DEBUG_LOG() << "incoming telegram: " << msg;
const QByteArray baJson = msg.toUtf8();
processMessage(baJson);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
}
void WsInterface::processMessage(const QByteArray baJson)
{
NOTICE_LOG(m_logger) << LOGFUNCTION << " START";
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START";
QJsonParseError parseError;
QJsonDocument doc = QJsonDocument::fromJson(baJson, &parseError);
if (parseError.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "Could not parse JSON "
ERROR_LOG() << "Could not parse JSON "
<< ". Reason: "
<< parseError.errorString()
<< "; baJson: '"
@@ -156,7 +156,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG(m_logger) << "Could not parse json telegram: "
ERROR_LOG() << "Could not parse json telegram: "
<< ", error: " << ex.what();
}
break;
@@ -176,7 +176,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG(m_logger) << "Could not parse json telegram: "
ERROR_LOG() << "Could not parse json telegram: "
<< ", error: " << ex.what();
return;
}
@@ -206,7 +206,7 @@ void WsInterface::processMessage(const QByteArray baJson)
}
catch (const JsonException &ex)
{
ERROR_LOG(m_logger) << "Could not parse json telegram: "
ERROR_LOG() << "Could not parse json telegram: "
<< ", error: " << ex.what();
return;
}
@@ -219,7 +219,7 @@ void WsInterface::processMessage(const QByteArray baJson)
default:
{
ERROR_LOG(m_logger) << "Telegram with typeId '" << typeId << "' not handled in switch"
ERROR_LOG() << "Telegram with typeId '" << typeId << "' not handled in switch"
<< ", doc= " << doc.toJson(QJsonDocument::Compact) << "<<<";
}
}
@@ -37,9 +37,6 @@ private:
QSet<QWebSocket *> m_clients;
std::shared_ptr<NgsHandler> m_ngsHandler;
NGL::INGLLogger &m_logger;
private slots:
void onNewConnection();