Skip to content

Commit 31fcc67

Browse files
nyalldawsonnyalldawson
committedSep 5, 2017
Replace use of deprecated QHeaderView methods
·
ltr-3_40final-3_0_0
1 parent 25a18b9 commit 31fcc67

15 files changed

+31
-31
lines changed
 

‎src/app/composer/qgsattributeselectiondialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
290290
//set up models, views and delegates
291291
mColumnModel = new QgsComposerAttributeTableColumnModelV2( mComposerTable, mColumnsTableView );
292292
mColumnsTableView->setModel( mColumnModel );
293-
mColumnsTableView->horizontalHeader()->setResizeMode( QHeaderView::Stretch );
293+
mColumnsTableView->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch );
294294

295295
mColumnSourceDelegate = new QgsComposerColumnSourceDelegate( vLayer, mColumnsTableView, mComposerTable );
296296
mColumnsTableView->setItemDelegateForColumn( 0, mColumnSourceDelegate );
@@ -312,7 +312,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
312312
mSortedProxyModel->sort( 0, Qt::AscendingOrder );
313313
mSortColumnTableView->setSortingEnabled( false );
314314
mSortColumnTableView->setModel( mSortedProxyModel );
315-
mSortColumnTableView->horizontalHeader()->setResizeMode( QHeaderView::Stretch );
315+
mSortColumnTableView->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch );
316316
}
317317

318318
mOrderComboBox->insertItem( 0, tr( "Ascending" ) );

‎src/app/composer/qgscomposer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,9 @@ QgsComposer::QgsComposer( QgsComposition *composition )
591591

592592
mItemsTreeView->setColumnWidth( 0, 30 );
593593
mItemsTreeView->setColumnWidth( 1, 30 );
594-
mItemsTreeView->header()->setResizeMode( 0, QHeaderView::Fixed );
595-
mItemsTreeView->header()->setResizeMode( 1, QHeaderView::Fixed );
596-
mItemsTreeView->header()->setMovable( false );
594+
mItemsTreeView->header()->setSectionResizeMode( 0, QHeaderView::Fixed );
595+
mItemsTreeView->header()->setSectionResizeMode( 1, QHeaderView::Fixed );
596+
mItemsTreeView->header()->setSectionsMovable( false );
597597

598598
mItemsTreeView->setDragEnabled( true );
599599
mItemsTreeView->setAcceptDrops( true );

‎src/app/locator/qgslocatoroptionswidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ QgsLocatorOptionsWidget::QgsLocatorOptionsWidget( QgsLocatorWidget *locator, QWi
3030
mFiltersTreeView->setModel( mModel );
3131

3232
mFiltersTreeView->header()->setStretchLastSection( false );
33-
mFiltersTreeView->header()->setResizeMode( 0, QHeaderView::Stretch );
33+
mFiltersTreeView->header()->setSectionResizeMode( 0, QHeaderView::Stretch );
3434

3535
mConfigureFilterButton->setEnabled( false );
3636
connect( mFiltersTreeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [ = ]( const QItemSelection & selected, const QItemSelection & )

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ void QgsIdentifyResultsDialog::addFeature( const QgsMapToolIdentify::IdentifyRes
447447
void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeature &f, const QMap<QString, QString> &derivedAttributes )
448448
{
449449
QTreeWidgetItem *layItem = layerItem( vlayer );
450-
lstResults->header()->setResizeMode( QHeaderView::ResizeToContents );
450+
lstResults->header()->setSectionResizeMode( QHeaderView::ResizeToContents );
451451
lstResults->header()->setStretchLastSection( false );
452452

453453
if ( !layItem )

‎src/app/qgsprojectproperties.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
259259
twIdentifyLayers->setHorizontalHeaderItem( 2, new QTableWidgetItem( tr( "Identifiable" ) ) );
260260
twIdentifyLayers->setHorizontalHeaderItem( 3, new QTableWidgetItem( tr( "Read Only" ) ) );
261261
twIdentifyLayers->setRowCount( mapLayers.size() );
262-
twIdentifyLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
262+
twIdentifyLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents );
263263

264264
int i = 0;
265265
for ( QMap<QString, QgsMapLayer *>::const_iterator it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it, i++ )
@@ -620,7 +620,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
620620
}
621621
}
622622
twWFSLayers->setRowCount( j );
623-
twWFSLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
623+
twWFSLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents );
624624

625625
mWCSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WCSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) );
626626
QStringList wcsLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WCSLayers" ), QStringLiteral( "/" ) );
@@ -659,7 +659,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
659659
}
660660
}
661661
twWCSLayers->setRowCount( j );
662-
twWCSLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
662+
twWCSLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents );
663663

664664
// Default Styles
665665
mStyle = QgsStyle::defaultStyle();

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ void QgsRasterLayerProperties::setupTransparencyTable( int nBands )
461461
tableTransparency->setHorizontalHeaderItem( 2, new QTableWidgetItem( tr( "Percent Transparent" ) ) );
462462
}
463463

464-
tableTransparency->horizontalHeader()->setResizeMode( 0, QHeaderView::Stretch );
465-
tableTransparency->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
464+
tableTransparency->horizontalHeader()->setSectionResizeMode( 0, QHeaderView::Stretch );
465+
tableTransparency->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch );
466466
}
467467

468468
void QgsRasterLayerProperties::populateTransparencyTable( QgsRasterRenderer *renderer )

‎src/gui/auth/qgsautheditorwidgets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void QgsAuthMethodPlugins::setupTable()
6363
tblAuthPlugins->setColumnWidth( 0, 150 );
6464
tblAuthPlugins->setColumnWidth( 1, 300 );
6565
tblAuthPlugins->setRowCount( QgsAuthManager::instance()->authMethodsKeys().size() );
66-
tblAuthPlugins->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents );
66+
tblAuthPlugins->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents );
6767
tblAuthPlugins->setSortingEnabled( true );
6868
tblAuthPlugins->setSelectionBehavior( QAbstractItemView::SelectRows );
6969
}

‎src/gui/qgsbrowserdockwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void QgsBrowserDockWidget::showEvent( QShowEvent *e )
122122
mBrowserView->setModel( mProxyModel );
123123
// provide a horizontal scroll bar instead of using ellipse (...) for longer items
124124
mBrowserView->setTextElideMode( Qt::ElideNone );
125-
mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
125+
mBrowserView->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
126126
mBrowserView->header()->setStretchLastSection( false );
127127

128128
// selectionModel is created when model is set on tree

‎src/gui/qgsorderbydialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ QgsOrderByDialog::QgsOrderByDialog( QgsVectorLayer *layer, QWidget *parent )
2929
{
3030
setupUi( this );
3131

32-
mOrderByTableWidget->horizontalHeader()->setResizeMode( QHeaderView::Stretch );
33-
mOrderByTableWidget->horizontalHeader()->setResizeMode( 1, QHeaderView::ResizeToContents );
34-
mOrderByTableWidget->horizontalHeader()->setResizeMode( 2, QHeaderView::ResizeToContents );
32+
mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch );
33+
mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::ResizeToContents );
34+
mOrderByTableWidget->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::ResizeToContents );
3535

3636
mOrderByTableWidget->installEventFilter( this );
3737

‎src/gui/qgsprojectionselectiontreewidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ QgsProjectionSelectionTreeWidget::QgsProjectionSelectionTreeWidget( QWidget *par
4949
// Get the full path name to the sqlite3 spatial reference database.
5050
mSrsDatabaseFileName = QgsApplication::srsDatabaseFilePath();
5151

52-
lstCoordinateSystems->header()->setResizeMode( AuthidColumn, QHeaderView::Stretch );
52+
lstCoordinateSystems->header()->setSectionResizeMode( AuthidColumn, QHeaderView::Stretch );
5353
lstCoordinateSystems->header()->resizeSection( QgisCrsIdColumn, 0 );
54-
lstCoordinateSystems->header()->setResizeMode( QgisCrsIdColumn, QHeaderView::Fixed );
54+
lstCoordinateSystems->header()->setSectionResizeMode( QgisCrsIdColumn, QHeaderView::Fixed );
5555

5656
// Hide (internal) ID column
5757
lstCoordinateSystems->setColumnHidden( QgisCrsIdColumn, true );
5858

59-
lstRecent->header()->setResizeMode( AuthidColumn, QHeaderView::Stretch );
59+
lstRecent->header()->setSectionResizeMode( AuthidColumn, QHeaderView::Stretch );
6060
lstRecent->header()->resizeSection( QgisCrsIdColumn, 0 );
61-
lstRecent->header()->setResizeMode( QgisCrsIdColumn, QHeaderView::Fixed );
61+
lstRecent->header()->setSectionResizeMode( QgisCrsIdColumn, QHeaderView::Fixed );
6262

6363
// Hide (internal) ID column
6464
lstRecent->setColumnHidden( QgisCrsIdColumn, true );

‎src/gui/qgstaskmanagerwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ QgsTaskManagerWidget::QgsTaskManagerWidget( QgsTaskManager *manager, QWidget *pa
4949
mTreeView->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
5050
mTreeView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
5151
mTreeView->header()->setStretchLastSection( false );
52-
mTreeView->header()->setResizeMode( 0, QHeaderView::Stretch );
52+
mTreeView->header()->setSectionResizeMode( 0, QHeaderView::Stretch );
5353

5454
vLayout->addWidget( mTreeView );
5555

‎src/gui/qgsvariableeditorwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ QgsVariableEditorTree::QgsVariableEditorTree( QWidget *parent )
273273
setAlternatingRowColors( true );
274274
setEditTriggers( QAbstractItemView::AllEditTriggers );
275275
setRootIsDecorated( false );
276-
header()->setMovable( false );
277-
header()->setResizeMode( QHeaderView::Interactive );
276+
header()->setSectionsMovable( false );
277+
header()->setSectionResizeMode( QHeaderView::Interactive );
278278

279279
mEditorDelegate = new VariableEditorDelegate( this, this );
280280
setItemDelegate( mEditorDelegate );

‎src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ void QgsGeometryCheckerFixSummaryDialog::addError( QTableWidget *table, QgsGeome
9797
void QgsGeometryCheckerFixSummaryDialog::setupTable( QTableWidget *table )
9898
{
9999
table->resizeColumnToContents( 0 );
100-
table->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
101-
table->horizontalHeader()->setResizeMode( 2, QHeaderView::Stretch );
102-
table->horizontalHeader()->setResizeMode( 3, QHeaderView::Stretch );
103-
table->horizontalHeader()->setResizeMode( 4, QHeaderView::Stretch );
100+
table->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch );
101+
table->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::Stretch );
102+
table->horizontalHeader()->setSectionResizeMode( 3, QHeaderView::Stretch );
103+
table->horizontalHeader()->setSectionResizeMode( 4, QHeaderView::Stretch );
104104

105105
table->setEditTriggers( QAbstractItemView::NoEditTriggers );
106106
table->setSelectionBehavior( QAbstractItemView::SelectRows );

‎src/plugins/grass/qgsgrassmoduleinput.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,8 +754,8 @@ void QgsGrassModuleInputSelectedView::setModel( QAbstractItemModel *model )
754754
QTreeView::setModel( model );
755755
header()->hide();
756756
header()->setStretchLastSection( false );
757-
header()->setResizeMode( 0, QHeaderView::Stretch );
758-
header()->setResizeMode( 1, QHeaderView::Fixed );
757+
header()->setSectionResizeMode( 0, QHeaderView::Stretch );
758+
header()->setSectionResizeMode( 1, QHeaderView::Fixed );
759759
header()->resizeSection( 1, 16 );
760760
}
761761

‎src/plugins/grass/qgsgrassnewmapset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ QgsGrassNewMapset::QgsGrassNewMapset( QgisInterface *iface,
117117
mMapsetsListView->clear();
118118
mMapsetLineEdit->setValidator( new QRegExpValidator( rx, mMapsetLineEdit ) );
119119

120-
mMapsetsListView->header()->setResizeMode( QHeaderView::ResizeToContents );
120+
mMapsetsListView->header()->setSectionResizeMode( QHeaderView::ResizeToContents );
121121

122122
// FINISH
123123
mOpenNewMapsetCheckBox->setChecked( settings.value( QStringLiteral( "GRASS/newMapsetWizard/openMapset" ), true ).toBool() );

0 commit comments

Comments
 (0)
Please sign in to comment.