Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
enabledAutoGeometryRestore is static
  • Loading branch information
nyalldawson committed Oct 15, 2018
1 parent 5f7f7b6 commit 1eba8ae
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/app/layout/qgslayoutimageexportoptionsdialog.cpp
Expand Up @@ -33,7 +33,7 @@ QgsLayoutImageExportOptionsDialog::QgsLayoutImageExportOptionsDialog( QWidget *p

connect( mClipToContentGroupBox, &QGroupBox::toggled, this, &QgsLayoutImageExportOptionsDialog::clipToContentsToggled );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
}

void QgsLayoutImageExportOptionsDialog::setResolution( double resolution )
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/qgslayoutmanagerdialog.cpp
Expand Up @@ -48,7 +48,7 @@ QgsLayoutManagerDialog::QgsLayoutManagerDialog( QWidget *parent, Qt::WindowFlags
connect( mTemplatesDefaultDirBtn, &QPushButton::pressed, this, &QgsLayoutManagerDialog::mTemplatesDefaultDirBtn_pressed );
connect( mTemplatesUserDirBtn, &QPushButton::pressed, this, &QgsLayoutManagerDialog::mTemplatesUserDirBtn_pressed );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
mTemplateFileWidget->setStorageMode( QgsFileWidget::GetFile );
mTemplateFileWidget->setFilter( tr( "Layout templates" ) + QStringLiteral( " (*.qpt *.QPT)" ) );
mTemplateFileWidget->setDialogTitle( tr( "Select a Template" ) );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdxfexportdialog.cpp
Expand Up @@ -423,7 +423,7 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f )
: QDialog( parent, f )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mVisibilityPresets, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDxfExportDialog::mVisibilityPresets_currentIndexChanged );
connect( mCrsSelector, &QgsProjectionSelectionWidget::crsChanged, this, &QgsDxfExportDialog::mCrsSelector_crsChanged );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsformannotationdialog.cpp
Expand Up @@ -48,7 +48,7 @@ QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *it
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsFormAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
}

void QgsFormAnnotationDialog::applySettingsToItem()
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgshtmlannotationdialog.cpp
Expand Up @@ -49,7 +49,7 @@ QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *it
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsHtmlAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
}

void QgsHtmlAnnotationDialog::applySettingsToItem()
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsnewspatialitelayerdialog.cpp
Expand Up @@ -45,7 +45,7 @@ QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::W
: QDialog( parent, fl )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mAddAttributeButton, &QToolButton::clicked, this, &QgsNewSpatialiteLayerDialog::mAddAttributeButton_clicked );
connect( mRemoveAttributeButton, &QToolButton::clicked, this, &QgsNewSpatialiteLayerDialog::mRemoveAttributeButton_clicked );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsrastercalcdialog.cpp
Expand Up @@ -33,7 +33,7 @@
QgsRasterCalcDialog::QgsRasterCalcDialog( QgsRasterLayer *rasterLayer, QWidget *parent, Qt::WindowFlags f ): QDialog( parent, f )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mRasterBandsListWidget, &QListWidget::itemDoubleClicked, this, &QgsRasterCalcDialog::mRasterBandsListWidget_itemDoubleClicked );
connect( mButtonBox, &QDialogButtonBox::accepted, this, &QgsRasterCalcDialog::mButtonBox_accepted );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgssvgannotationdialog.cpp
Expand Up @@ -51,7 +51,7 @@ QgsSvgAnnotationDialog::QgsSvgAnnotationDialog( QgsMapCanvasAnnotationItem *item
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsSvgAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
}

void QgsSvgAnnotationDialog::mBrowseToolButton_clicked()
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgstextannotationdialog.cpp
Expand Up @@ -45,7 +45,7 @@ QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsMapCanvasAnnotationItem *it
mTextEdit->setDocument( mTextDocument.get() );
}

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
mFontColorButton->setAllowOpacity( true );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsorganizetablecolumnsdialog.cpp
Expand Up @@ -46,7 +46,7 @@ QgsOrganizeTableColumnsDialog::QgsOrganizeTableColumnsDialog( const QgsVectorLay
: QDialog( parent, flags )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mShowAllButton, &QAbstractButton::clicked, this, &QgsOrganizeTableColumnsDialog::showAll );
connect( mHideAllButton, &QAbstractButton::clicked, this, &QgsOrganizeTableColumnsDialog::hideAll );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
Expand Up @@ -26,7 +26,7 @@ QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Q
{
setupUi( this );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

//make button exclusive
QButtonGroup *buttonGroup = new QButtonGroup( this );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/ogr/qgsvectorlayersaveasdialog.cpp
Expand Up @@ -94,7 +94,7 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( QgsVectorLayer *layer, i
void QgsVectorLayerSaveAsDialog::setup()
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mFormatComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsVectorLayerSaveAsDialog::mFormatComboBox_currentIndexChanged );
connect( mCrsSelector, &QgsProjectionSelectionWidget::crsChanged, this, &QgsVectorLayerSaveAsDialog::mCrsSelector_crsChanged );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
Expand Up @@ -87,7 +87,7 @@ QgsProcessingAlgorithmDialogBase::QgsProcessingAlgorithmDialogBase( QWidget *par
handleLayout->addStretch();
splitterHandle->setLayout( handleLayout );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

QgsSettings settings;
splitter->restoreState( settings.value( QStringLiteral( "/Processing/dialogBaseSplitter" ), QByteArray() ).toByteArray() );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionbuilderdialog.cpp
Expand Up @@ -23,7 +23,7 @@ QgsExpressionBuilderDialog::QgsExpressionBuilderDialog( QgsVectorLayer *layer, c
, mRecentKey( key )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( builder, &QgsExpressionBuilderWidget::parserErrorChanged, this, &QgsExpressionBuilderDialog::syncOkButtonEnabledState );
connect( builder, &QgsExpressionBuilderWidget::evalErrorChanged, this, &QgsExpressionBuilderDialog::syncOkButtonEnabledState );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsexpressionselectiondialog.cpp
Expand Up @@ -32,7 +32,7 @@ QgsExpressionSelectionDialog::QgsExpressionSelectionDialog( QgsVectorLayer *laye
{
setupUi( this );

QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mActionSelect, &QAction::triggered, this, &QgsExpressionSelectionDialog::mActionSelect_triggered );
connect( mActionAddToSelection, &QAction::triggered, this, &QgsExpressionSelectionDialog::mActionAddToSelection_triggered );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsnewgeopackagelayerdialog.cpp
Expand Up @@ -50,7 +50,7 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
: QDialog( parent, fl )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

connect( mAddAttributeButton, &QToolButton::clicked, this, &QgsNewGeoPackageLayerDialog::mAddAttributeButton_clicked );
connect( mRemoveAttributeButton, &QToolButton::clicked, this, &QgsNewGeoPackageLayerDialog::mRemoveAttributeButton_clicked );
Expand Down

0 comments on commit 1eba8ae

Please sign in to comment.