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

@@ -34,10 +34,9 @@ static inline QByteArray escapeData(const QByteArray &bufferData)
WlsHandler::WlsHandler(QObject *parent)
: QObject(parent)
, m_logger(getLogger("WlsHandler"))
{
if (Settings::wlsMgrsBasePoint().size() <= 15)
WARNING_LOG(m_logger) << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
WARNING_LOG() << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
}
WlsHandler::~WlsHandler()
@@ -51,14 +50,14 @@ bool WlsHandler::init(WlsParticipantHandler *participantHandler,
{
m_participantHandler = participantHandler;
m_wsHandler = wsHandler;
INFO_LOG(m_logger) << "WlsHandler::init";
INFO_LOG() << "WlsHandler::init";
delete m_tcpServer;
m_tcpServer = new QTcpServer(this);
connect(m_tcpServer, &QTcpServer::newConnection,
this, &WlsHandler::onIncomingConnection);
if (!m_tcpServer->listen(QHostAddress::Any, listenPort))
{
WARNING_LOG(m_logger) << "Error listening on port " << listenPort;
WARNING_LOG() << "Error listening on port " << listenPort;
return false;
}
@@ -88,7 +87,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
auto itSocket = m_tcpSocketByTagId.constFind(tagId);
if (itSocket == m_tcpSocketByTagId.constEnd())
{
ERROR_LOG(m_logger) << "Can't find a TCP-socket for tag id: " << tagId;
ERROR_LOG() << "Can't find a TCP-socket for tag id: " << tagId;
return false;
}
@@ -113,7 +112,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
data.append(s_endMark);
(*itSocket)->write(data);
DEBUG_LOG(m_logger) << "Sending telegram to wls: " << escapeData(data);
DEBUG_LOG() << "Sending telegram to wls: " << escapeData(data);
}
(*itSocket)->flush();
return true;
@@ -121,7 +120,7 @@ bool WlsHandler::sendWlsMessage(const QByteArray &tagId, WlsTelegramId telId, co
void WlsHandler::onIncomingConnection()
{
INFO_LOG(m_logger) << "WlsHandler::onIncomingConnection";
INFO_LOG() << "WlsHandler::onIncomingConnection";
QTcpSocket *tcpSocket = m_tcpServer->nextPendingConnection();
if (!tcpSocket)
return;
@@ -146,7 +145,7 @@ void WlsHandler::onIncomingData()
return;
auto &tcpBuffer = m_tcpSockets[s];
const QByteArray bufferData = tcpBuffer + s->readAll();
TRACE_LOG(m_logger) << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
TRACE_LOG() << "WlsHandler::onIncomingData bufferData='" << escapeData(bufferData) << "'";
tcpBuffer = parseBuffer(bufferData, s);
@@ -157,7 +156,7 @@ void WlsHandler::onSocketDisconnected()
QTcpSocket *s = qobject_cast<QTcpSocket *>(sender());
if (!s)
return;
INFO_LOG(m_logger) << "Socket disconnected";
INFO_LOG() << "Socket disconnected";
m_tcpSockets.remove(s);
@@ -203,7 +202,7 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
const WlsTelegramId telegramId = static_cast<WlsTelegramId>(parts.at(0).toInt());
const QDateTime timestamp = QDateTime::fromString(QString::fromUtf8(parts.at(1)), QStringLiteral("yyyy-MM-dd hh:mm:ss.zzz"));
if (telegramId != WlsTelegramId::PlayerPosition)
DEBUG_LOG(m_logger) << "Handling " << telegramId
DEBUG_LOG() << "Handling " << telegramId
<< ", data: '" << escapeData(baTele) << "'";
bool bOk = true;
switch (telegramId)
@@ -221,11 +220,11 @@ void WlsHandler::parseWlsTelegram(const QByteArray &baTele, QTcpSocket *socket)
bOk = handleDataPayloadMobileToHost(parts);
break;
case WlsTelegramId::PayloadHostToMobile:
WARNING_LOG(m_logger) << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
WARNING_LOG() << "Protocol error - got a message which should not be sent from Wls (PayloadHostToMobile)";
break;
}
if (!bOk)
WARNING_LOG(m_logger) << "Error handling telegram: '" << baTele << "'";
WARNING_LOG() << "Error handling telegram: '" << baTele << "'";
}
bool WlsHandler::findNextSyncStartByte(const QByteArray &buffer, int &iCurReadPos)
@@ -258,7 +257,7 @@ bool WlsHandler::handleVersionsinformation(const QList<QByteArray> &data)
{
if (data.size() < 4)
return false;
DEBUG_LOG(m_logger) << "TX(WLS): Version = " << data.at(3);
DEBUG_LOG() << "TX(WLS): Version = " << data.at(3);
return true;
}
@@ -291,7 +290,7 @@ bool WlsHandler::handlePlayerPosition(const QList<QByteArray> &data, const QDate
pos.z += m_wlsZOffset;
p->setPosition(pos, timestamp.toMSecsSinceEpoch());
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerPosition"
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerPosition"
<< " x=" << pos.x << ", y=" << pos.y << ", z=" << pos.z
<< ", wlsAreaId=" << pos.wlsAreaId
<< ", wlsBuildingId=" << pos.wlsBuildingId
@@ -325,7 +324,7 @@ bool WlsHandler::handlePlayerState(const QList<QByteArray> &data)
p->voltage = voltage / 10.;
INFO_LOG(m_logger) << p->getPlayerIdStr() << ": handlePlayerState"
INFO_LOG() << p->getPlayerIdStr() << ": handlePlayerState"
<< " timeout=" << timeout
<< " ,tacticalState=" << tacticalState
<< " ,voltage=" << p->voltage;
@@ -341,7 +340,7 @@ bool WlsHandler::checkPayloadIsHex(const QByteArray &payload) const
(c < 'a' || c > 'f') &&
(c < 'A' || c > 'F'))
{
WARNING_LOG(m_logger) << "Payload data is not hex coded ...";
WARNING_LOG() << "Payload data is not hex coded ...";
return false;
}
}
@@ -361,7 +360,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
QSharedPointer<SfmMessage_rx> msg = SfmMessageConverter::generateRxMessage(payload);
if (!msg)
{
WARNING_LOG(m_logger) << "Can not convert payload to SfmMessage ... ";
WARNING_LOG() << "Can not convert payload to SfmMessage ... ";
return false;
}
@@ -388,7 +387,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
case SfmMessage::MsgId::LicenseState:
case SfmMessage::MsgId::TacticalState:
default:
WARNING_LOG(m_logger) << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
WARNING_LOG() << "RX(WLS): MessageID(" << static_cast<int>(msg->getId()) << ")";
break;
}
return true;
@@ -398,7 +397,7 @@ bool WlsHandler::handleDataPayloadMobileToHost(const QList<QByteArray> &data)
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgEquipmentId *sfmTele)
{
const int equipmentNumber = sfmTele->getEquipmentNumber();
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": handlePayload"
INFO_LOG() << participant->getPlayerIdStr() << ": handlePayload"
<< " - new equipmentNumber = " << equipmentNumber;
if (participant->equipmentNumber() == 0 ||
participant->equipmentNumber() != equipmentNumber)
@@ -415,7 +414,7 @@ void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgRequestG
void WlsHandler::handlePayload(WlsParticipant *participant, const SfmMsgSfmRestart_rx *sfmTele)
{
WARNING_LOG(m_logger) << "Restart notification ... " << participant->tagId();
WARNING_LOG() << "Restart notification ... " << participant->tagId();
Q_UNUSED(sfmTele)
participant->setWlsZone(-1);
@@ -442,7 +441,7 @@ void WlsHandler::sendGpsMode(WlsParticipant *participant)
return;
SfmMsgGpsControl_tx msg;
msg.setGpsOn(participant->isGpsMode());
INFO_LOG(m_logger) << participant->getPlayerIdStr() << ": sendGpsMode"
INFO_LOG() << participant->getPlayerIdStr() << ": sendGpsMode"
<< " GpsMode = " << participant->isGpsMode();
sendWlsMessage(participant->tagId(), msg);
}
@@ -453,7 +452,7 @@ bool WlsHandler::parseDoubleCm(const QByteArray &data, double &num) const
num = data.toDouble(&bOk);
if (!bOk)
{
WARNING_LOG(m_logger) << "Error parsing floating point number '" << data << "'";
WARNING_LOG() << "Error parsing floating point number '" << data << "'";
return false;
}
num /= 100;
@@ -466,7 +465,7 @@ bool WlsHandler::parseInteger(const QByteArray &data, int &num) const
num = data.toInt(&bOk);
if (!bOk)
{
WARNING_LOG(m_logger) << "Error parsing number '" << data << "'";
WARNING_LOG() << "Error parsing number '" << data << "'";
return false;
}
return true;
@@ -494,7 +493,7 @@ WlsParticipant *WlsHandler::participantFromTagId(const QByteArray &tagId, bool b
SfmMsgRequestEquipmentId_tx getEqId;
INFO_LOG(m_logger) << "Requesting Equipment number for tag " << tagId;
INFO_LOG() << "Requesting Equipment number for tag " << tagId;
sendWlsMessage(tagId, getEqId);
p->lastEquipmentNumberRequest = tNow;
}