diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp index 911bb683cc4b..6d0abc16f9d4 100644 --- a/src/app/composer/qgsattributeselectiondialog.cpp +++ b/src/app/composer/qgsattributeselectiondialog.cpp @@ -290,7 +290,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa //set up models, views and delegates mColumnModel = new QgsComposerAttributeTableColumnModelV2( mComposerTable, mColumnsTableView ); mColumnsTableView->setModel( mColumnModel ); - mColumnsTableView->horizontalHeader()->setResizeMode( QHeaderView::Stretch ); + mColumnsTableView->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch ); mColumnSourceDelegate = new QgsComposerColumnSourceDelegate( vLayer, mColumnsTableView, mComposerTable ); mColumnsTableView->setItemDelegateForColumn( 0, mColumnSourceDelegate ); @@ -312,7 +312,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa mSortedProxyModel->sort( 0, Qt::AscendingOrder ); mSortColumnTableView->setSortingEnabled( false ); mSortColumnTableView->setModel( mSortedProxyModel ); - mSortColumnTableView->horizontalHeader()->setResizeMode( QHeaderView::Stretch ); + mSortColumnTableView->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch ); } mOrderComboBox->insertItem( 0, tr( "Ascending" ) ); diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index 394875ad2915..11e09ac396a2 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -591,9 +591,9 @@ QgsComposer::QgsComposer( QgsComposition *composition ) mItemsTreeView->setColumnWidth( 0, 30 ); mItemsTreeView->setColumnWidth( 1, 30 ); - mItemsTreeView->header()->setResizeMode( 0, QHeaderView::Fixed ); - mItemsTreeView->header()->setResizeMode( 1, QHeaderView::Fixed ); - mItemsTreeView->header()->setMovable( false ); + mItemsTreeView->header()->setSectionResizeMode( 0, QHeaderView::Fixed ); + mItemsTreeView->header()->setSectionResizeMode( 1, QHeaderView::Fixed ); + mItemsTreeView->header()->setSectionsMovable( false ); mItemsTreeView->setDragEnabled( true ); mItemsTreeView->setAcceptDrops( true ); diff --git a/src/app/locator/qgslocatoroptionswidget.cpp b/src/app/locator/qgslocatoroptionswidget.cpp index c0c0add99df8..8972c237ba64 100644 --- a/src/app/locator/qgslocatoroptionswidget.cpp +++ b/src/app/locator/qgslocatoroptionswidget.cpp @@ -30,7 +30,7 @@ QgsLocatorOptionsWidget::QgsLocatorOptionsWidget( QgsLocatorWidget *locator, QWi mFiltersTreeView->setModel( mModel ); mFiltersTreeView->header()->setStretchLastSection( false ); - mFiltersTreeView->header()->setResizeMode( 0, QHeaderView::Stretch ); + mFiltersTreeView->header()->setSectionResizeMode( 0, QHeaderView::Stretch ); mConfigureFilterButton->setEnabled( false ); connect( mFiltersTreeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [ = ]( const QItemSelection & selected, const QItemSelection & ) diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp index d7be19d0cc2c..262e39a9c0a5 100644 --- a/src/app/qgsidentifyresultsdialog.cpp +++ b/src/app/qgsidentifyresultsdialog.cpp @@ -447,7 +447,7 @@ void QgsIdentifyResultsDialog::addFeature( const QgsMapToolIdentify::IdentifyRes void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeature &f, const QMap &derivedAttributes ) { QTreeWidgetItem *layItem = layerItem( vlayer ); - lstResults->header()->setResizeMode( QHeaderView::ResizeToContents ); + lstResults->header()->setSectionResizeMode( QHeaderView::ResizeToContents ); lstResults->header()->setStretchLastSection( false ); if ( !layItem ) diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index d443f9f91b3c..1009c8014017 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -259,7 +259,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa twIdentifyLayers->setHorizontalHeaderItem( 2, new QTableWidgetItem( tr( "Identifiable" ) ) ); twIdentifyLayers->setHorizontalHeaderItem( 3, new QTableWidgetItem( tr( "Read Only" ) ) ); twIdentifyLayers->setRowCount( mapLayers.size() ); - twIdentifyLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents ); + twIdentifyLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents ); int i = 0; for ( QMap::const_iterator it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it, i++ ) @@ -620,7 +620,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa } } twWFSLayers->setRowCount( j ); - twWFSLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents ); + twWFSLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents ); mWCSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WCSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); QStringList wcsLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WCSLayers" ), QStringLiteral( "/" ) ); @@ -659,7 +659,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa } } twWCSLayers->setRowCount( j ); - twWCSLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents ); + twWCSLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents ); // Default Styles mStyle = QgsStyle::defaultStyle(); diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index 9599b2ee90b3..835093b31e4d 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -461,8 +461,8 @@ void QgsRasterLayerProperties::setupTransparencyTable( int nBands ) tableTransparency->setHorizontalHeaderItem( 2, new QTableWidgetItem( tr( "Percent Transparent" ) ) ); } - tableTransparency->horizontalHeader()->setResizeMode( 0, QHeaderView::Stretch ); - tableTransparency->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch ); + tableTransparency->horizontalHeader()->setSectionResizeMode( 0, QHeaderView::Stretch ); + tableTransparency->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch ); } void QgsRasterLayerProperties::populateTransparencyTable( QgsRasterRenderer *renderer ) diff --git a/src/gui/auth/qgsautheditorwidgets.cpp b/src/gui/auth/qgsautheditorwidgets.cpp index b809c2a21a7b..e7ea6f48b640 100644 --- a/src/gui/auth/qgsautheditorwidgets.cpp +++ b/src/gui/auth/qgsautheditorwidgets.cpp @@ -63,7 +63,7 @@ void QgsAuthMethodPlugins::setupTable() tblAuthPlugins->setColumnWidth( 0, 150 ); tblAuthPlugins->setColumnWidth( 1, 300 ); tblAuthPlugins->setRowCount( QgsAuthManager::instance()->authMethodsKeys().size() ); - tblAuthPlugins->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents ); + tblAuthPlugins->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents ); tblAuthPlugins->setSortingEnabled( true ); tblAuthPlugins->setSelectionBehavior( QAbstractItemView::SelectRows ); } diff --git a/src/gui/qgsbrowserdockwidget.cpp b/src/gui/qgsbrowserdockwidget.cpp index 6dca2149f142..82b3f93d48bd 100644 --- a/src/gui/qgsbrowserdockwidget.cpp +++ b/src/gui/qgsbrowserdockwidget.cpp @@ -122,7 +122,7 @@ void QgsBrowserDockWidget::showEvent( QShowEvent *e ) mBrowserView->setModel( mProxyModel ); // provide a horizontal scroll bar instead of using ellipse (...) for longer items mBrowserView->setTextElideMode( Qt::ElideNone ); - mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); + mBrowserView->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); mBrowserView->header()->setStretchLastSection( false ); // selectionModel is created when model is set on tree diff --git a/src/gui/qgsorderbydialog.cpp b/src/gui/qgsorderbydialog.cpp index efddb60c5c69..86664790423e 100644 --- a/src/gui/qgsorderbydialog.cpp +++ b/src/gui/qgsorderbydialog.cpp @@ -29,9 +29,9 @@ QgsOrderByDialog::QgsOrderByDialog( QgsVectorLayer *layer, QWidget *parent ) { setupUi( this ); - mOrderByTableWidget->horizontalHeader()->setResizeMode( QHeaderView::Stretch ); - mOrderByTableWidget->horizontalHeader()->setResizeMode( 1, QHeaderView::ResizeToContents ); - mOrderByTableWidget->horizontalHeader()->setResizeMode( 2, QHeaderView::ResizeToContents ); + mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch ); + mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::ResizeToContents ); + mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::ResizeToContents ); mOrderByTableWidget->installEventFilter( this ); diff --git a/src/gui/qgsprojectionselectiontreewidget.cpp b/src/gui/qgsprojectionselectiontreewidget.cpp index 4a09461beb8e..5ec2d65037e0 100644 --- a/src/gui/qgsprojectionselectiontreewidget.cpp +++ b/src/gui/qgsprojectionselectiontreewidget.cpp @@ -49,16 +49,16 @@ QgsProjectionSelectionTreeWidget::QgsProjectionSelectionTreeWidget( QWidget *par // Get the full path name to the sqlite3 spatial reference database. mSrsDatabaseFileName = QgsApplication::srsDatabaseFilePath(); - lstCoordinateSystems->header()->setResizeMode( AuthidColumn, QHeaderView::Stretch ); + lstCoordinateSystems->header()->setSectionResizeMode( AuthidColumn, QHeaderView::Stretch ); lstCoordinateSystems->header()->resizeSection( QgisCrsIdColumn, 0 ); - lstCoordinateSystems->header()->setResizeMode( QgisCrsIdColumn, QHeaderView::Fixed ); + lstCoordinateSystems->header()->setSectionResizeMode( QgisCrsIdColumn, QHeaderView::Fixed ); // Hide (internal) ID column lstCoordinateSystems->setColumnHidden( QgisCrsIdColumn, true ); - lstRecent->header()->setResizeMode( AuthidColumn, QHeaderView::Stretch ); + lstRecent->header()->setSectionResizeMode( AuthidColumn, QHeaderView::Stretch ); lstRecent->header()->resizeSection( QgisCrsIdColumn, 0 ); - lstRecent->header()->setResizeMode( QgisCrsIdColumn, QHeaderView::Fixed ); + lstRecent->header()->setSectionResizeMode( QgisCrsIdColumn, QHeaderView::Fixed ); // Hide (internal) ID column lstRecent->setColumnHidden( QgisCrsIdColumn, true ); diff --git a/src/gui/qgstaskmanagerwidget.cpp b/src/gui/qgstaskmanagerwidget.cpp index 173054a08a77..a0e5c311122f 100644 --- a/src/gui/qgstaskmanagerwidget.cpp +++ b/src/gui/qgstaskmanagerwidget.cpp @@ -49,7 +49,7 @@ QgsTaskManagerWidget::QgsTaskManagerWidget( QgsTaskManager *manager, QWidget *pa mTreeView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); mTreeView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn ); mTreeView->header()->setStretchLastSection( false ); - mTreeView->header()->setResizeMode( 0, QHeaderView::Stretch ); + mTreeView->header()->setSectionResizeMode( 0, QHeaderView::Stretch ); vLayout->addWidget( mTreeView ); diff --git a/src/gui/qgsvariableeditorwidget.cpp b/src/gui/qgsvariableeditorwidget.cpp index e382a13c0ca7..32072c6822a7 100644 --- a/src/gui/qgsvariableeditorwidget.cpp +++ b/src/gui/qgsvariableeditorwidget.cpp @@ -273,8 +273,8 @@ QgsVariableEditorTree::QgsVariableEditorTree( QWidget *parent ) setAlternatingRowColors( true ); setEditTriggers( QAbstractItemView::AllEditTriggers ); setRootIsDecorated( false ); - header()->setMovable( false ); - header()->setResizeMode( QHeaderView::Interactive ); + header()->setSectionsMovable( false ); + header()->setSectionResizeMode( QHeaderView::Interactive ); mEditorDelegate = new VariableEditorDelegate( this, this ); setItemDelegate( mEditorDelegate ); diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp index b73186c41556..3ca612b9d340 100644 --- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp +++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp @@ -97,10 +97,10 @@ void QgsGeometryCheckerFixSummaryDialog::addError( QTableWidget *table, QgsGeome void QgsGeometryCheckerFixSummaryDialog::setupTable( QTableWidget *table ) { table->resizeColumnToContents( 0 ); - table->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch ); - table->horizontalHeader()->setResizeMode( 2, QHeaderView::Stretch ); - table->horizontalHeader()->setResizeMode( 3, QHeaderView::Stretch ); - table->horizontalHeader()->setResizeMode( 4, QHeaderView::Stretch ); + table->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch ); + table->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::Stretch ); + table->horizontalHeader()->setSectionResizeMode( 3, QHeaderView::Stretch ); + table->horizontalHeader()->setSectionResizeMode( 4, QHeaderView::Stretch ); table->setEditTriggers( QAbstractItemView::NoEditTriggers ); table->setSelectionBehavior( QAbstractItemView::SelectRows ); diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp index f73ca596f67b..ebd307f7031f 100644 --- a/src/plugins/grass/qgsgrassmoduleinput.cpp +++ b/src/plugins/grass/qgsgrassmoduleinput.cpp @@ -754,8 +754,8 @@ void QgsGrassModuleInputSelectedView::setModel( QAbstractItemModel *model ) QTreeView::setModel( model ); header()->hide(); header()->setStretchLastSection( false ); - header()->setResizeMode( 0, QHeaderView::Stretch ); - header()->setResizeMode( 1, QHeaderView::Fixed ); + header()->setSectionResizeMode( 0, QHeaderView::Stretch ); + header()->setSectionResizeMode( 1, QHeaderView::Fixed ); header()->resizeSection( 1, 16 ); } diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp index dd096f1f6011..9805d6c4b6a7 100644 --- a/src/plugins/grass/qgsgrassnewmapset.cpp +++ b/src/plugins/grass/qgsgrassnewmapset.cpp @@ -117,7 +117,7 @@ QgsGrassNewMapset::QgsGrassNewMapset( QgisInterface *iface, mMapsetsListView->clear(); mMapsetLineEdit->setValidator( new QRegExpValidator( rx, mMapsetLineEdit ) ); - mMapsetsListView->header()->setResizeMode( QHeaderView::ResizeToContents ); + mMapsetsListView->header()->setSectionResizeMode( QHeaderView::ResizeToContents ); // FINISH mOpenNewMapsetCheckBox->setChecked( settings.value( QStringLiteral( "GRASS/newMapsetWizard/openMapset" ), true ).toBool() );