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 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495

No files matched your search

@@ -2,6 +2,7 @@
#include "pre_edit_dialog.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include "ui_pre_edit_dialog.h"
#include <LtsSession/lts_session.h>
@@ -20,6 +21,7 @@ PresentationEditDialog::PresentationEditDialog(QWidget *parent)
, m_opmDtc(nullptr)
, m_presentationId(-1)
, m_ui(new Ui::PresentationEditDialog)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
DEBUG_LOG(m_logger) << "PresentationEditDialog ctor";
@@ -69,8 +71,8 @@ bool PresentationEditDialog::init(int presentationId,
if (m_presentationId > 0)
{
PresentationManagement::Presentation p = m_dtc->presentation(m_presentationId);
m_ui->leName->setText(QString::fromStdString(p.name()));
m_ui->teDesc->setText(QString::fromStdString(p.description()));
m_ui->leName->setText(QString::fromStdString(p.name));
m_ui->teDesc->setText(QString::fromStdString(p.description));
m_ui->lblFileStatus->setVisible(true);
m_ui->leFileStatus->setVisible(true);
@@ -81,9 +83,9 @@ bool PresentationEditDialog::init(int presentationId,
m_ui->lblOperator->setVisible(true);
m_ui->leOperator->setVisible(true);
m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(p.operatorId()).name()));
m_ui->leLastModified->setText(DTG::toStringMSec(p.lastModified()));
m_ui->leFileStatus->setText(PresentationManagement::toString(p.fileStatus()));
m_ui->leOperator->setText(QString::fromStdString(m_opmDtc->user(p.operatorId).name));
m_ui->leLastModified->setText(DTG::toStringMSec(p.lastModified));
m_ui->leFileStatus->setText(PresentationManagement::toString(p.fileStatus));
}
m_ui->ltsDialogButtonBox->getButton(LtsWidgets::DialogButton::Add)->setDisabled(m_ui->leName->text().isEmpty());
@@ -120,12 +122,12 @@ void PresentationEditDialog::onSavePresentation()
bool PresentationEditDialog::apply()
{
PresentationModifyRequest req;
req.id(m_presentationId);
req.name(m_ui->leName->text().toStdString());
req.description(m_ui->teDesc->toPlainText().toStdString());
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
req.lastModified(QDateTime::currentMSecsSinceEpoch());
req.fileStatus(FileStatus::Valid);
req.id = m_presentationId;
req.name = m_ui->leName->text().toStdString();
req.description = m_ui->teDesc->toPlainText().toStdString();
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
req.lastModified = QDateTime::currentMSecsSinceEpoch();
req.fileStatus = FileStatus::Valid;
try
{
@@ -133,15 +135,15 @@ bool PresentationEditDialog::apply()
{
auto reply(m_ftc->getPresentationContentRequest(GetPresentationContentRequest(m_presentationId)));
m_content = reply.content();
m_content = reply.content;
if (m_content.empty())
{
throw std::runtime_error(QStringLiteral("No content for presentation with id %1").arg(reply.id()).toStdString().c_str());
throw std::runtime_error(QStringLiteral("No content for presentation with id %1").arg(reply.id).toStdString().c_str());
}
}
DEBUG_LOG(m_logger) << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
req.content(m_content);
req.content = m_content;
m_presentationId = m_ftc->presentationModifyRequest(req);
}
@@ -2,11 +2,13 @@
#include "pre_mobile_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace PresentationManagement
{
PreMobileDialogModel::PreMobileDialogModel(QObject *parent)
: PresentationManagementDialogModel(parent)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
m_checkboxColumn = 1;
@@ -71,7 +73,7 @@ QVector<int> PreMobileDialogModel::getDownloadedScriptIds() const
if (m_vecDownload.size() <= i)
break;
if (m_vecDownload.at(i))
ret.push_back(p.id());
ret.push_back(p.id);
}
return ret;
}
@@ -6,7 +6,7 @@
#include <PresentationManagement/logger.h>
#include <preguicommon_export.h>
#include <PresentationManagement/Common/pre_model.h>
#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
namespace PresentationManagement
{
@@ -2,6 +2,7 @@
#include "pre_model.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <ngltools/ngltools_dtg.h>
#include <PresentationManagement/pre_translation.h>
@@ -19,6 +20,7 @@ PresentationManagementDialogModel::PresentationManagementDialogModel(QObject *pa
tr("LastModified"),
tr("Status")},
parent)
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
}
@@ -35,15 +37,15 @@ bool PresentationManagementDialogModel::initModel(const std::shared_ptr<Interfac
m_predicate = predicate;
connect(dtc.get(), &Interface::Dtc::presentationChanged,
this, &PresentationManagementDialogModel::onDataChanged);
dtc->presentations([this](const Presentation &p) { insertRow(p); m_scriptUsers.append(p.operatorId()); });
dtc->presentations([this](const Presentation &p) { insertRow(p); m_scriptUsers.append(p.operatorId); });
QMap<qint32, OperatorManagement::User> users = opmDtc->users();
m_users.clear();
for (auto it = users.constBegin(); it != users.constEnd(); ++it)
{
if (m_scriptUsers.contains(it->id()))
m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
if (m_scriptUsers.contains(it->id))
m_users.insert(static_cast<int>(it.value().id), QString::fromStdString(it.value().name));
}
INFO_LOG(m_logger) << "initModel - #presentations: " << m_vecData.size();
@@ -83,7 +85,7 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
if (role == Qt::BackgroundRole)
{
if (pre.fileStatus() == PresentationManagement::FileStatus::Deleted)
if (pre.fileStatus == PresentationManagement::FileStatus::Deleted)
return QGuiApplication::palette().color(QPalette::Disabled, QPalette::AlternateBase);
return QGuiApplication::palette().color(QPalette::Active, QPalette::Base);
}
@@ -93,17 +95,17 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
switch (index.column())
{
case Id:
return pre.id();
return pre.id;
case Name:
return QString::fromStdString(pre.name());
return QString::fromStdString(pre.name);
case Description:
return QString::fromStdString(pre.description());
return QString::fromStdString(pre.description);
case Operator:
return QString::fromStdString(m_opmDtc->user(pre.operatorId()).name());
return QString::fromStdString(m_opmDtc->user(pre.operatorId).name);
case LastModified:
return QDateTime::fromMSecsSinceEpoch(pre.lastModified());
return QDateTime::fromMSecsSinceEpoch(pre.lastModified);
case Status:
return PresentationManagement::toString(pre.fileStatus());
return PresentationManagement::toString(pre.fileStatus);
}
}
@@ -112,7 +114,7 @@ QVariant PresentationManagementDialogModel::data(const QModelIndex &index, int r
switch (index.column())
{
case Columns::Operator:
return pre.operatorId();
return pre.operatorId;
default:
return {};
@@ -141,7 +143,7 @@ bool PresentationManagementDialogProxyModel::lessThan(const QModelIndex &source
switch (source_left.column())
{
case PresentationManagementDialogModel::LastModified:
return dataLeft.lastModified() < dataRight.lastModified();
return dataLeft.lastModified < dataRight.lastModified;
case PresentationManagementDialogModel::Id:
case PresentationManagementDialogModel::Name:
case PresentationManagementDialogModel::Description: