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

@@ -27,7 +27,7 @@ PlanTopicEditor::PlanTopicEditor(
, m_flmDtc(flmDtc)
, m_model(nullptr)
, m_ui(new Ui::PlanTopicEditor)
.getNGLLogger("PlanTopicEditor"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_ui->setupUi(this);
@@ -98,7 +98,7 @@ void PlanTopicEditor::updateInternalData()
fakePlanItem[QStringLiteral("fileId")] = fileId;
QString fileName;
if (m_flmDtc)
fileName = QString::fromStdString(m_flmDtc->fileContent(fileId).name());
fileName = QString::fromStdString(m_flmDtc->fileContent(fileId).name);
if (fileName.isEmpty())
fileName = tr("Plan file id %1").arg(fileId);
fakePlanItem[QStringLiteral("fileName")] = fileName;
@@ -25,7 +25,7 @@ namespace PlanOverlaysPlugin
void FileManagementReplyHandler::onGetFileContentDataReply( const FileManagement::GetFileContentDataReply & replyObject )
{
m_content = replyObject.content();
m_content = replyObject.content;
m_requestHelper->requestReply(replyObject);
}
@@ -45,7 +45,7 @@ public:
PlanOverlayModel::PlanOverlayModel() : QAbstractItemModel(), m_internal(new InternalData())
.getNGLLogger("PlanOverlayModel"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{;}
PlanOverlayModel::~PlanOverlayModel()
@@ -106,7 +106,7 @@ public:
pi.m_keyId = obj[QStringLiteral("keyId")].toInt();
pi.m_folderId = obj[QStringLiteral("folderId")].toInt();
pi.m_fileId = obj[QStringLiteral("fileId")].toInt();
pi.m_fileName = obj[QStringLiteral("fileName")].toInt();
pi.m_fileName = obj[QStringLiteral("fileName")].toString();
pi.m_exerciseId = obj[QStringLiteral("exerciseId")].toInt();
pi.m_phaseId = obj[QStringLiteral("phaseId")].toInt();
@@ -8,7 +8,7 @@
#include "TopicEditor/topic_editor.h"
#include "flm_reply_handler.h"
#include <LtsUtils/pgarray.h>
#include <LtsUtilsCore/pgarray.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <NGLLogger/INGLLogger.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -24,9 +24,9 @@
#include <PlanEditor/ped_operator_rights.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <FileManagement/Explorer/TopicEditor/topic_editor.h>
#include <FileManagement/Gui/Explorer/TopicEditor/topic_editor.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Viewer/SituationMap/Map/map.h>
#include <Viewer/SituationMap/GeometryModel/geometry_model_factory.h>
@@ -109,6 +109,7 @@ InterfaceImpl::InterfaceImpl(LtsSession::LtsSession * session)
, m_internal(new InternalData())
, m_foreignIfc(nullptr)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_internal->m_requestHelper = new LtsUtils::RequestHelper(this);
m_internal->m_flmReplyHandler = new FileManagementReplyHandler(m_internal->m_requestHelper);
@@ -248,19 +249,19 @@ bool InterfaceImpl::loadPlan(int planFileId,
FileManagement::FileContent fileContent = m_internal->m_dtc->fileContent(planFileId);
if (fileContent.id() <= 0)
if (fileContent.id <= 0)
{
ERROR_LOG(m_logger) << "Could not find plan with id " << planFileId << " in filemanagement - removing";
return false;
}
QString nameOfPlan = QString::fromStdString(fileContent.name());
QString nameOfPlan = QString::fromStdString(fileContent.name);
std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this, fileContent, applyMinMaxScaleOfMetadata, nameOfPlan, overrideSitMapIfc, planItemObject](const Core::FunctionReply &)
{
const QByteArray &planXMLContent = LtsUtils::toQByteArray(m_internal->m_flmReplyHandler->getContent());
int planFileId = fileContent.id();
int planFileId = fileContent.id;
if (!overrideSitMapIfc->planOverlaySetContent(planFileId, nameOfPlan, planXMLContent))
@@ -274,12 +275,12 @@ bool InterfaceImpl::loadPlan(int planFileId,
if (!planItem.isValid())
planItem = m_internal->m_overlayModel->planItem(-1);
planItem.m_folderId = fileContent.folderId();
if (fileContent.exerciseId().is_set())
planItem.m_folderId = fileContent.folderId;
if (fileContent.exerciseId.has_value())
{
planItem.m_exerciseId = fileContent.exerciseId().get();
if (fileContent.phaseId().is_set())
planItem.m_phaseId = fileContent.phaseId().get();
planItem.m_exerciseId = fileContent.exerciseId.get();
if (fileContent.phaseId.has_value())
planItem.m_phaseId = fileContent.phaseId.get();
}
planItem.m_fileId = planFileId;
planItem.m_fileName = nameOfPlan;
@@ -353,7 +354,7 @@ bool InterfaceImpl::loadPlan(int planFileId,
bool ok = m_internal->m_requestHelper->startSingleRequest([this, planFileId]()
{
FileManagement::GetFileContentDataRequest req;
req.fileContentId(planFileId);
req.fileContentId = planFileId;
return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
}, handleContent);
@@ -394,13 +395,13 @@ void InterfaceImpl::onUpdatePlan(int planId)
int planFileId = planItem.m_fileId;
FileManagement::FileContent fileContent = m_internal->m_dtc->fileContent(planFileId);
planItem.m_fileName = QString::fromStdString(fileContent.name());
planItem.m_fileName = QString::fromStdString(fileContent.name);
std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this,planFileId,planItem](const Core::FunctionReply &baseReply)
{
const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(planFileId, planItem.m_fileName, planXMLContent))
@@ -417,7 +418,7 @@ void InterfaceImpl::onUpdatePlan(int planId)
bool ok = m_internal->m_requestHelper->startSingleRequest([this, planFileId]()
{
FileManagement::GetFileContentDataRequest req;
req.fileContentId(planFileId);
req.fileContentId = planFileId;
return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
}, handleContent);
@@ -553,13 +554,13 @@ void InterfaceImpl::onReloadPlanById(int planId)
{
int fileId = planItem.m_fileId;
FileManagement::FileContent fileContent = m_internal->m_dtc->fileContent(fileId);
QString nameOfPlan = QString::fromStdString(fileContent.name());
QString nameOfPlan = QString::fromStdString(fileContent.name);
std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this,planId,nameOfPlan](const Core::FunctionReply &baseReply)
{
const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
if (planXMLContent.isEmpty())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
@@ -589,7 +590,7 @@ void InterfaceImpl::onReloadPlanById(int planId)
bool ok = m_internal->m_requestHelper->startSingleRequest([this,fileId]() -> bool
{
FileManagement::GetFileContentDataRequest req;
req.fileContentId(fileId);
req.fileContentId = fileId;
return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
}, handleContent);
@@ -685,9 +686,9 @@ void InterfaceImpl::onChangePlanOrderOnMap(const QVector<int> &newIdOrder)
void InterfaceImpl::onPlanContentChanged(const FileManagement::FileContent &data, DataModification modType)
{
if (data.fileType() != FileManagement::FileType::TacticalPlan) return;
if (data.fileType != FileManagement::FileType::TacticalPlan) return;
const PlanOverlaysPlugin::PlanOverlayModel::PlanItem &planItem = m_internal->m_overlayModel->findPlanItemByFileId(data.id());
const PlanOverlaysPlugin::PlanOverlayModel::PlanItem &planItem = m_internal->m_overlayModel->findPlanItemByFileId(data.id);
if (planItem.isValid())
{
@@ -709,7 +710,7 @@ void InterfaceImpl::onExerciseChanged(const ExerciseManagement::Exercise &data,
case DataModification::eModified:
{
DEBUG_LOG(m_logger) << "onExerciseChanged - Modified";
m_internal->m_overlayModel->reInitModel(data.id(), data.activePhaseId());
m_internal->m_overlayModel->reInitModel(data.id, data.activePhaseId);
break;
}
default:
@@ -737,14 +738,14 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
}
FileManagement::FileContent fileContent = m_internal->m_dtc->fileContent(planFileId);
QString nameOfPlan = QString::fromStdString(fileContent.name());
QString nameOfPlan = QString::fromStdString(fileContent.name);
int planId = planItem.m_keyId;
std::function<void(const Core::FunctionReply &baseReply)> handleContent = [this, planId, nameOfPlan, fileContent](const Core::FunctionReply &baseReply)
{
const FileManagement::GetFileContentDataReply &reply = static_cast<const FileManagement::GetFileContentDataReply &>(baseReply);
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content());
const QByteArray &planXMLContent = LtsUtils::toQByteArray(reply.content);
if (planXMLContent.isEmpty())
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error plan [" << nameOfPlan << "] is empty";
@@ -761,7 +762,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
}
if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(fileContent.id(), nameOfPlan, planXMLContent))
if (!m_internal->m_foreignSitmapIfc->planOverlaySetContent(fileContent.id, nameOfPlan, planXMLContent))
{
ERROR_LOG(m_logger) << Q_FUNC_INFO << "Error rendering planContent [" << nameOfPlan << "]";
return false;
@@ -770,13 +771,13 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
pi.m_fileName = nameOfPlan;
pi.m_fileId = fileContent.id();
pi.m_folderId = fileContent.folderId();
if (fileContent.exerciseId().is_set())
pi.m_fileId = fileContent.id;
pi.m_folderId = fileContent.folderId;
if (fileContent.exerciseId.has_value())
{
pi.m_exerciseId = fileContent.exerciseId().get();
if (fileContent.phaseId().is_set())
pi.m_phaseId = fileContent.phaseId().get();
pi.m_exerciseId = fileContent.exerciseId.get();
if (fileContent.phaseId.has_value())
pi.m_phaseId = fileContent.phaseId.get();
}
@@ -789,7 +790,7 @@ void InterfaceImpl::onReloadPlanByName(const PlanOverlaysPlugin::PlanOverlayMode
bool ok = m_internal->m_requestHelper->startSingleRequest([this,planFileId]() -> bool
{
FileManagement::GetFileContentDataRequest req;
req.fileContentId(planFileId);
req.fileContentId = planFileId;
return m_internal->m_ftc->getFileContentDataRequest(req, m_internal->m_flmReplyHandler);
}, handleContent);
@@ -9,7 +9,7 @@
#include <TopicEditorBase/topic_editor_interface.h>
#include <Lts/Common/ProjectConfig/project_defines.h>
#include <PlanOverlays/plan_overlays_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <QtCore/QObject>
@@ -170,9 +170,10 @@ NGL::INGLLogger &m_logger;
private:
InterfaceImpl *m_ovr;
SituationMap::ForeignGuiInterface *m_foreignSitmapIfc;
QVector<int> m_loadedPlanFileIds;
};
NGL::INGLLogger &m_logger;
};
TopicReplay::Interface *createInterface(TopicEditorBase::TopicType) override;