Skip to content

Commit a11e0c6

Browse files
authoredSep 5, 2017
Merge pull request #5130 from nyalldawson/deprecated
Fix use of some deprecated Qt methods
2 parents 26b9c04 + 1b5fbf9 commit a11e0c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+109
-110
lines changed
 

‎src/analysis/raster/qgsalignraster.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ QgsAlignRaster::RasterInfo::RasterInfo( const QString &layerpath )
568568
( void ) GDALGetGeoTransform( mDataset, mGeoTransform );
569569

570570
// TODO: may be null or empty string
571-
mCrsWkt = QString::fromAscii( GDALGetProjectionRef( mDataset ) );
571+
mCrsWkt = QString::fromLatin1( GDALGetProjectionRef( mDataset ) );
572572

573573
mBandCnt = GDALGetBandNumber( mDataset );
574574
}

‎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" ) );

0 commit comments

Comments
 (0)
Please sign in to comment.