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:
1718 files changed
+126739
-18495
No files matched your search
+14
-12
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user