Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495

No files matched your search

@@ -2,6 +2,7 @@
#include "main_dispatcher.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "main_handler_tx.h"
#include "wls_dispatcher.h"
#include "wls_handler_tx.h"
@@ -20,6 +21,7 @@ MainDispatcher::MainDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_recvFromTabCb(recvFromTabCb)
, m_mainHandlerTx(std::make_shared<MainHandlerTx>(std::dynamic_pointer_cast<WlsHandlerTx>(m_wlsDispatcher->sendToTab()),
std::dynamic_pointer_cast<TetraHandlerTx>(m_tetraDispatcher->sendToTab())))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
@@ -2,6 +2,7 @@
#include "main_handler_tx.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "tetra_handler_tx.h"
#include "wls_handler_tx.h"
@@ -40,6 +41,7 @@ MainHandlerTx::MainHandlerTx(const std::shared_ptr<WlsHandlerTx> &wlsTx,
const std::shared_ptr<TetraHandlerTx> &tetraTx)
: m_wlsHandlerTx(wlsTx)
, m_tetraHandlerTx(tetraTx)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
SendToTab::HandleState MainHandlerTx::canHandleTelegram(int equipmentNumber, int telegramId) const
@@ -257,6 +259,30 @@ bool MainHandlerTx::txData(const TetraIcd::SetDevicePowerRequest &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::UAVPerformMission &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::OcCommand &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::ExFireReadiness &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::ExFiredReport &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::ExConfirmationReport &data)
{
return sendToTxMixin(&data);
}
bool MainHandlerTx::txData(const TetraIcd::UAVChangeState &data)
{
return sendToTxMixin(&data);
}
template <typename T>
bool MainHandlerTx::sendToTxMixin(const T *data)
{
@@ -63,6 +63,11 @@ public:
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
private:
template <typename T>
bool sendToTxMixin(const T *data);
@@ -14,6 +14,7 @@ namespace WlsTetra
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TabWlsPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
NGL::Settings *settings)
{
Q_UNUSED(sendToTabCb);
@@ -19,6 +19,7 @@ public:
std::shared_ptr<TrainingAreaBase::Plugin::Interface> createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTabCb,
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
NGL::Settings *settings) override;
};
@@ -2,6 +2,7 @@
#include "tetra_dispatcher.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "tetra_handler_rx.h"
#include "tetra_handler_tx.h"
@@ -18,6 +19,7 @@ TetraDispatcher::TetraDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_txHandler(std::make_shared<TetraHandlerTx>())
, m_tetraPrtCnv(new TetraPrtCnv(pdp, this))
, m_dataProvider(pdp)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
connect(m_tetraPrtCnv, &TetraPrtCnv::tetraConnectionChanged,
this, &TetraDispatcher::onTetraConnectionChanged);
@@ -2,6 +2,7 @@
#include "tetra_handler_rx.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <TrainingAreaBase/training_area_telegrams.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@@ -2,6 +2,7 @@
#include "tetra_handler_tx.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@@ -10,6 +11,7 @@ namespace WlsTetra
TetraHandlerTx::TetraHandlerTx()
: QObject()
, SendToTab()
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
resetSendCounter();
}
@@ -248,6 +250,31 @@ bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
{
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data)
{
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data)
{
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data)
{
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
{
Q_UNUSED(data);
return false;
}
bool TetraHandlerTx::sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data)
{
@@ -62,6 +62,11 @@ public:
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
bool sendToTx(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *data);
Q_SIGNALS:
@@ -2,6 +2,7 @@
#include "plugin.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "tetra_prtcnv.h"
#include <nglsettings/nglsettings_connections.h>
#include <QtCore/QCoreApplication>
@@ -20,6 +21,7 @@ TetraPrtCnv::TetraPrtCnv(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_prtCnvApp(nullptr)
, m_exerciseId(0)
, m_radioGrpId(0)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
TetraPrtCnv::~TetraPrtCnv()
@@ -41,11 +43,11 @@ bool TetraPrtCnv::init()
void TetraPrtCnv::onExerciseChanged()
{
if (m_pdp->exerciseRadioGroup().id() != m_radioGrpId)
if (m_pdp->exerciseRadioGroup().id != m_radioGrpId)
if (!updatePrtCnv())
ERROR_LOG(m_logger) << "Error changing PrtCnv state from radio grp id: "
<< m_radioGrpId
<< " to " << m_pdp->exerciseRadioGroup().id();
<< " to " << m_pdp->exerciseRadioGroup().id;
}
void TetraPrtCnv::logWlsTelegram(const TrainingAreaBase::TetraIcd::TrainingAreaTelegram *tele, bool bIsSend)
@@ -56,7 +58,7 @@ void TetraPrtCnv::logWlsTelegram(const TrainingAreaBase::TetraIcd::TrainingAreaT
bool TetraPrtCnv::updatePrtCnv()
{
int newRadioGrpId = m_pdp->exerciseRadioGroup().id();
int newRadioGrpId = m_pdp->exerciseRadioGroup().id;
if (newRadioGrpId == m_radioGrpId)
{
@@ -83,13 +85,13 @@ bool TetraPrtCnv::updatePrtCnv()
s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId));
s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId));
s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection"));
s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname()));
s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort());
s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname()));
s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort());
s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi());
s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1());
s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2());
s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname));
s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort);
s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname));
s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort);
s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi);
s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1);
s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2);
s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0);
s.setValue(QStringLiteral("Injection/Port"), randomListenPort());
s.sync();
@@ -2,6 +2,7 @@
#include "wls_dispatcher.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "wls_handler_rx.h"
#include "wls_handler_tx.h"
@@ -22,6 +23,7 @@ WlsDispatcher::WlsDispatcher(TrainingAreaBase::Plugin::DataProvider *pdp,
, m_webSocket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
, m_webSocketReconnectTimer(new QTimer(this))
, m_bWarnedOnce(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
connect(m_webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error),
this, &WlsDispatcher::onWebSocketError);
@@ -2,6 +2,7 @@
#include "wls_handler_rx.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "wls_dispatcher.h"
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -2,6 +2,7 @@
#include "wls_handler_tx.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "wls_dispatcher.h"
#include <QtCore/QJsonDocument>
@@ -19,6 +20,7 @@ WlsHandlerTx::WlsHandlerTx(TrainingAreaBase::Plugin::DataProvider *pdp, WlsDispa
, m_webSocket(nullptr)
, m_dispatcher(dispatcher)
, m_bWlsConnectedToExternalSystem(false)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{}
void WlsHandlerTx::onWlsConnected(QWebSocket *webSocket)
@@ -288,16 +290,41 @@ bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunitio
return sendToTx(&data);
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data)
{
return sendToTx(&data);
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::OcCommand &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data)
{
Q_UNUSED(data);
return false;
}
bool WlsHandlerTx::txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data)
{
Q_UNUSED(data);
return false;
}
void WlsHandlerTx::onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible)
{
@@ -64,6 +64,11 @@ public:
bool txData(const TrainingAreaBase::TetraIcd::SelectiveReammunition &data) override;
bool txData(const TrainingAreaBase::TetraIcd::SetDevicePowerRequest &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVPerformMission &data) override;
bool txData(const TrainingAreaBase::TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &data) override;
bool txData(const TrainingAreaBase::TetraIcd::UAVChangeState &data) override;
public Q_SLOTS:
void onParticipantConnectionState(int equipmentNumber, bool dataCommunicationPossible);