sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-09 00:35:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Q_GLOBAL_STATIC for QgsLayoutDesignerDialog

Browse Source
This commit is contained in:
Matthias Kuhn 2019-10-31 16:37:02 +01:00
parent 179ef42bc4
commit 9847c3c0bc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -98,9 +98,11 @@
#ifdef ENABLE_MODELTEST #ifdef ENABLE_MODELTEST
#include "modeltest.h" #include "modeltest.h"
#endif #endif
#include <QGlobalStatic>
//add some nice zoom levels for zoom comboboxes //add some nice zoom levels for zoom comboboxes
QList<double> QgsLayoutDesignerDialog::sStatusZoomLevelsList { 0.125, 0.25, 0.5, 1.0, 2.0, 4.0, 8.0}; typedef QList<double> DoubleList;
Q_GLOBAL_STATIC_WITH_ARGS( DoubleList, sStatusZoomLevelsList, ( { 0.125, 0.25, 0.5, 1.0, 2.0, 4.0, 8.0} ) )
#define FIT_LAYOUT -101 #define FIT_LAYOUT -101
#define FIT_LAYOUT_WIDTH -102 #define FIT_LAYOUT_WIDTH -102
@ -717,8 +719,8 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
QValidator *zoomValidator = new QRegularExpressionValidator( zoomRx, mStatusZoomCombo ); QValidator *zoomValidator = new QRegularExpressionValidator( zoomRx, mStatusZoomCombo );
mStatusZoomCombo->lineEdit()->setValidator( zoomValidator ); mStatusZoomCombo->lineEdit()->setValidator( zoomValidator );
const auto constSStatusZoomLevelsList = sStatusZoomLevelsList; const auto statusZoomLevelsList = *sStatusZoomLevelsList();
for ( double level : constSStatusZoomLevelsList ) for ( double level : statusZoomLevelsList )
{ {
mStatusZoomCombo->insertItem( 0, tr( "%1%" ).arg( level * 100.0, 0, 'f', 1 ), level ); mStatusZoomCombo->insertItem( 0, tr( "%1%" ).arg( level * 100.0, 0, 'f', 1 ), level );
} }

2
src/app/layout/qgslayoutdesignerdialog.h
View File

@ -424,8 +424,6 @@ class QgsLayoutDesignerDialog: public QMainWindow, public Ui::QgsLayoutDesignerB
QLabel *mStatusCursorYLabel = nullptr; QLabel *mStatusCursorYLabel = nullptr;
QLabel *mStatusCursorPageLabel = nullptr; QLabel *mStatusCursorPageLabel = nullptr;
static QList<double> sStatusZoomLevelsList;
QgsLayoutViewToolAddItem *mAddItemTool = nullptr; QgsLayoutViewToolAddItem *mAddItemTool = nullptr;
QgsLayoutViewToolAddNodeItem *mAddNodeItemTool = nullptr; QgsLayoutViewToolAddNodeItem *mAddNodeItemTool = nullptr;
QgsLayoutViewToolPan *mPanTool = nullptr; QgsLayoutViewToolPan *mPanTool = nullptr;