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
+12
-12
@@ -9,7 +9,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <PresentationManagement/Common/pre_model.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtCore/QTimer>
|
||||
@@ -43,7 +43,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
|
||||
auto predicate = [](const PresentationManagement::Presentation & p)
|
||||
{
|
||||
return (!p.isDeleted() && p.fileStatus() == FileStatus::Valid);
|
||||
return (!p.isDeleted && p.fileStatus == FileStatus::Valid);
|
||||
};
|
||||
m_model->initModel(dtc, opmDtc, predicate);
|
||||
m_proxy->setSourceModel(m_model);
|
||||
@@ -122,7 +122,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
|
||||
for (rowCounter = 0; rowCounter < m_model->rowCount(); ++rowCounter)
|
||||
{
|
||||
if (m_model->getRowData(rowCounter).id() == scriptId)
|
||||
if (m_model->getRowData(rowCounter).id == scriptId)
|
||||
{
|
||||
isExistingScriptId = true;
|
||||
break;
|
||||
@@ -140,7 +140,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
{
|
||||
const Presentation p = m_model->getRowData(rowCounter);
|
||||
|
||||
if (p.id() <= 0)
|
||||
if (p.id <= 0)
|
||||
return;
|
||||
|
||||
setEnabled(false);
|
||||
@@ -148,7 +148,7 @@ ScriptChooser::ScriptChooser(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
if (!m_isImportDialog)
|
||||
LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(true);
|
||||
|
||||
emit signalSelectScript(p.id());
|
||||
emit signalSelectScript(p.id);
|
||||
m_close = true;
|
||||
close();
|
||||
});
|
||||
@@ -182,11 +182,11 @@ void ScriptChooser::onDeleteScript()
|
||||
const FileStatus fs = FileStatus::Deleted;
|
||||
PresentationChangeStatusRequest req;
|
||||
|
||||
req.id(pre.id());
|
||||
req.fileStatus(fs);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
|
||||
req.id = pre.id;
|
||||
req.fileStatus = fs;
|
||||
req.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
req.lastModified = QDateTime::currentMSecsSinceEpoch();
|
||||
DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id;
|
||||
|
||||
m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
@@ -233,7 +233,7 @@ void ScriptChooser::onImportScript()
|
||||
const QModelIndex idx = m_ui->ltsDataView->currentIndex();
|
||||
const Presentation p = m_model->getRowData(idx.row());
|
||||
|
||||
if (p.id() <= 0)
|
||||
if (p.id <= 0)
|
||||
return;
|
||||
|
||||
setEnabled(false);
|
||||
@@ -241,7 +241,7 @@ void ScriptChooser::onImportScript()
|
||||
if (!m_isImportDialog)
|
||||
LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(true);
|
||||
|
||||
emit signalSelectScript(p.id());
|
||||
emit signalSelectScript(p.id);
|
||||
m_close = true;
|
||||
close();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user