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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "opm_settings_group.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
@@ -16,6 +17,7 @@ SettingsGroup::SettingsGroup(const QString &group, const QString &id, SubSetHand
|
||||
, m_id(id)
|
||||
, m_subSetHandler(handler)
|
||||
, m_opSettings(opSettings)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_logger.setNoSpace(false);
|
||||
}
|
||||
|
||||
+10
-7
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "operator_settings_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_operator_settings_dialog.h"
|
||||
|
||||
#include "operator_settings_create_new_dialog.h"
|
||||
@@ -9,7 +10,7 @@
|
||||
#include <OperatorManagement/Gui/Common/operator_change_password.h>
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtilsCore/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
@@ -27,6 +28,7 @@
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QRandomGenerator>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
|
||||
@@ -125,7 +127,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
m_ui->cbTimeZone->addItem(QString(QChar(tz)), tz);
|
||||
|
||||
const QChar tz = m_opSettings->value(groupTimeSettings, QStringLiteral("TimeZone"), QChar()).toChar();
|
||||
idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz);
|
||||
idx = m_ui->cbTimeZone->findData(tz.isNull() ? 0 : tz.unicode());
|
||||
if (idx >= 0)
|
||||
m_ui->cbTimeZone->setCurrentIndex(idx);
|
||||
else
|
||||
@@ -190,7 +192,7 @@ bool OperatorSettingsDialog::init(const QMap<QString, SettingsGroup *> *workspac
|
||||
return false;
|
||||
|
||||
OperatorManagement::User op = m_dtc->user(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
m_ui->ltsProfileButton->setPixmap(LtsUtils::getPixmap(op.image()));
|
||||
m_ui->ltsProfileButton->setPixmap(LtsUtils::getPixmap(op.image));
|
||||
|
||||
this->enaDisaOpsettings(enaDisaOpsettings);
|
||||
this->enaDisaFilterPresets(enaDisaFilterPresets);
|
||||
@@ -221,7 +223,7 @@ void OperatorSettingsDialog::keyPressEvent(QKeyEvent *event)
|
||||
if (event->key() == '#')
|
||||
m_keyCache.clear();
|
||||
else
|
||||
m_keyCache += event->key();
|
||||
m_keyCache += QChar(event->key());
|
||||
|
||||
QDateTime dt(QDateTime::currentDateTime());
|
||||
QDate d = dt.date();
|
||||
@@ -602,8 +604,8 @@ void OperatorSettingsDialog::onChangeProfilePicture()
|
||||
m_operatorPixmap = pixmap;
|
||||
|
||||
OperatorCreateModifyRequest req;
|
||||
req.id(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.image(LtsUtils::fromPixmap(m_operatorPixmap));
|
||||
req.id = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
req.image = LtsUtils::fromPixmap(m_operatorPixmap);
|
||||
|
||||
m_requestHelper->addRequest([this, req]()
|
||||
{
|
||||
@@ -649,6 +651,7 @@ void OperatorSettingsDialog::onMineAreaInputModeChanged()
|
||||
|
||||
TetraBoard::TetraBoard(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
|
||||
setFocusPolicy(Qt::StrongFocus);
|
||||
@@ -989,7 +992,7 @@ void TetraBoard::drawSquare(QPainter &painter, int x, int y, TetraShape shape)
|
||||
|
||||
void TetraPiece::setRandomShape()
|
||||
{
|
||||
setShape(TetraShape(qrand() % 7 + 1));
|
||||
setShape(TetraShape(QRandomGenerator::global()->bounded(7) + 1));
|
||||
}
|
||||
|
||||
void TetraPiece::setShape(TetraShape shape)
|
||||
|
||||
+3
-3
@@ -884,7 +884,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
|
||||
= m_fltParticipantIfc->symbolAppearanceForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
|
||||
FilterManagement::SymbolAppearance appearance = appearanceSettings->settingsToData();
|
||||
|
||||
subset.data = QString::fromStdString(appearance.content());
|
||||
subset.data = QString::fromStdString(appearance.content);
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
@@ -895,7 +895,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
|
||||
= m_fltAesIfc->aesFilterForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
|
||||
FilterManagement::AesFilter aesFilter = displayFilter->filterToData();
|
||||
|
||||
subset.data = QJsonValue(QString::fromStdString(aesFilter.content()));
|
||||
subset.data = QJsonValue(QString::fromStdString(aesFilter.content));
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
@@ -906,7 +906,7 @@ bool InterfaceImpl::saveSubSet(SubSet &subset)
|
||||
= m_fltBuildingComponentIfc->buildingComponentSettingsForOperator(LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), m_session->workspaceId());
|
||||
FilterManagement::BuildingComponentFilter filter = settings->bldCmpSettingsToData();
|
||||
|
||||
subset.data = QJsonValue(QString::fromStdString(filter.content()));
|
||||
subset.data = QJsonValue(QString::fromStdString(filter.content));
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user