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

@@ -22,7 +22,6 @@ HlaDispatcher::HlaDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
, m_webSocketReconnectTimer(new QTimer(this))
, m_bWarnedOnce(false)
, m_logger(getLogger("HlaDispatcher"))
{
connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
this, &HlaDispatcher::onWebSocketError);
@@ -68,7 +67,7 @@ void HlaDispatcher::onHlaConnected()
void HlaDispatcher::onHlaDisconnected()
{
INFO_LOG(m_logger) << "Hla socket disconnected";
INFO_LOG() << "Hla socket disconnected";
m_webSocketReconnectTimer->start(5000);
m_sendToHla->onHlaDisconnected();
@@ -86,7 +85,7 @@ void HlaDispatcher::onWebSocketError()
if (!m_webSocket)
return;
if (!m_bWarnedOnce)
WARNING_LOG(m_logger) << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
WARNING_LOG() << "Error connecting to " << webSocketUrl().toString() << ": " << m_webSocket->errorString();
m_webSocket->close();
m_webSocketReconnectTimer->start(5000);
m_bWarnedOnce = true;
@@ -6,7 +6,7 @@
#include <QObject>
#include <QWebSocket>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include "logger.h"
class QTimer;
@@ -50,8 +50,6 @@ private:
QWebSocket *m_webSocket;
QTimer *m_webSocketReconnectTimer;
bool m_bWarnedOnce;
NGL::INGLLogger &m_logger;
};
}
@@ -15,7 +15,6 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
: m_rxHandler(recvFromTabCb)
, m_dispatcher(dispatcher)
, m_bWarnedOnce(false)
, m_logger(getLogger("HlaHandlerRx"))
{}
bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
@@ -25,7 +24,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
if (baJson.isEmpty())
return false;
const QJsonObject obj = QJsonDocument::fromJson(baJson).object();
TRACE_LOG(m_logger) << "incoming telegram: " << baJson;
TRACE_LOG() << "incoming telegram: " << baJson;
@@ -40,7 +39,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
const QJsonValue typeId = obj.value(QStringLiteral("typeId"));
if (!typeId.isDouble())
{
ERROR_LOG(m_logger) << "Can not read type id: " << baJson;
ERROR_LOG() << "Can not read type id: " << baJson;
return false;
}
const QJsonObject data = obj.value(QStringLiteral("data")).toObject();
@@ -126,7 +125,7 @@ bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
}
catch (const std::exception &e)
{
WARNING_LOG(m_logger) << "Could not parse json: " << e.what() << " (" << baJson << ")";
WARNING_LOG() << "Could not parse json: " << e.what() << " (" << baJson << ")";
return false;
}
return true;
@@ -139,7 +138,7 @@ void HlaHandlerRx::rxData(const T &data)
{
if (!m_bWarnedOnce)
{
ERROR_LOG(m_logger) << "No RecvFromTab available";
ERROR_LOG() << "No RecvFromTab available";
m_bWarnedOnce = true;
}
return;
@@ -30,6 +30,5 @@ private:
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_rxHandler;
HlaDispatcher *m_dispatcher;
bool m_bWarnedOnce;
LOGGER_T m_logger;
};
}
@@ -12,7 +12,6 @@ HlaHandlerTx::HlaHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp)
: m_pdp(pdp)
, m_webSocket(nullptr)
, m_bHlaConnectedToExternalSystem(false)
, m_logger(getLogger("HlaHandlerTx"))
{}
void HlaHandlerTx::onHlaConnected(QWebSocket *webSocket)
@@ -296,7 +295,7 @@ bool HlaHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
void HlaHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
{
INFO_LOG(m_logger) << "onParticipantConnectionState - " << equipmentNumber
INFO_LOG() << "onParticipantConnectionState - " << equipmentNumber
<< ", communication possible: " << dataCommunicationPossible;
if (equipmentNumber == -1)
m_dataCommunicationPossible.clear();
@@ -315,7 +314,7 @@ bool HlaHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegr
const QByteArray ba = QJsonDocument(obj).toJson(QJsonDocument::Compact);
if (data->id() != TrainingAreaBase::TetraIcd::TelegramId::BESTAETIGUNG)
DEBUG_LOG(m_logger) << "Sending tele: " << ba;
DEBUG_LOG() << "Sending tele: " << ba;
m_webSocket->sendTextMessage(QString::fromUtf8(ba));
return true;
}
@@ -79,6 +79,5 @@ private:
TrainingAreaBase::Plugin::DataProvider *m_pdp;
QWebSocket *m_webSocket;
bool m_bHlaConnectedToExternalSystem;
LOGGER_T m_logger;
};
}
@@ -14,7 +14,6 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
: m_wlsDispatcher(new HlaDispatcher(pdp, recvFromTabCb, settings))
, m_recvFromTabCb(recvFromTabCb)
, m_mainHandlerTx(std::make_shared<MainHandlerTx>(std::dynamic_pointer_cast<HlaHandlerTx>(m_wlsDispatcher->sendToTab())))
, m_logger(getLogger("MainDispatcher"))
{}
MainDispatcher::~MainDispatcher()
@@ -5,7 +5,7 @@
#include <QObject>
#include <TrainingAreaBase/tab_plugin_interface.h>
#include <DDS/Core/function_reply_object.h>
#include <DDS/Core/core_types.h>
#include "logger.h"
namespace HlaJson
@@ -35,7 +35,5 @@ private:
std::shared_ptr<TrainingAreaBase::RecvFromTab> m_recvFromTabCb;
std::shared_ptr<TrainingAreaBase::SendToTab> m_mainHandlerTx;
NGL::INGLLogger &m_logger;
};
}
@@ -10,7 +10,6 @@ namespace HlaJson
{
MainHandlerTx::MainHandlerTx(const std::shared_ptr<HlaHandlerTx> &wlsTx)
: m_wlsHandlerTx(wlsTx)
, m_logger(getLogger("MainHandlerTx"))
{}
SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
@@ -72,6 +72,5 @@ private:
bool sendToTxMixin(const T *data);
private:
std::shared_ptr<HlaHandlerTx> m_wlsHandlerTx;
LOGGER_T m_logger;
};
}