From 25a18b9ca1a6f02024904bafcab95c3cf87a8b38 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 13:52:25 +1000 Subject: [PATCH 1/8] Replace use of deprecated QString::fromAscii --- src/analysis/raster/qgsalignraster.cpp | 2 +- src/app/qgshandlebadlayers.cpp | 2 +- src/core/qgsapplication.cpp | 2 +- src/core/qgsexpressionlexer.ll | 6 +++--- src/core/qgsmaplayer.cpp | 4 ++-- src/core/qgsmaprenderercustompainterjob.cpp | 2 +- src/core/qgsmaprendererparalleljob.cpp | 4 ++-- src/core/qgssqlstatementlexer.ll | 8 ++++---- .../evis/databaseconnection/evisdatabaseconnectiongui.cpp | 2 +- src/providers/delimitedtext/qgsdelimitedtextprovider.cpp | 2 +- .../delimitedtext/qgsdelimitedtextsourceselect.cpp | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/analysis/raster/qgsalignraster.cpp b/src/analysis/raster/qgsalignraster.cpp index 3b96d8e375e..0512ccd8a65 100644 --- a/src/analysis/raster/qgsalignraster.cpp +++ b/src/analysis/raster/qgsalignraster.cpp @@ -568,7 +568,7 @@ QgsAlignRaster::RasterInfo::RasterInfo( const QString &layerpath ) ( void ) GDALGetGeoTransform( mDataset, mGeoTransform ); // TODO: may be null or empty string - mCrsWkt = QString::fromAscii( GDALGetProjectionRef( mDataset ) ); + mCrsWkt = QString::fromLatin1( GDALGetProjectionRef( mDataset ) ); mBandCnt = GDALGetBandNumber( mDataset ); } diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp index d211bb35985..3856718da93 100644 --- a/src/app/qgshandlebadlayers.cpp +++ b/src/app/qgshandlebadlayers.cpp @@ -236,7 +236,7 @@ void QgsHandleBadLayers::setFilename( int row, const QString &filename ) QUrl uriSource = QUrl::fromEncoded( datasource.toLatin1() ); QUrl uriDest = QUrl::fromLocalFile( filename ); uriDest.setQueryItems( uriSource.queryItems() ); - datasource = QString::fromAscii( uriDest.toEncoded() ); + datasource = QString::fromLatin1( uriDest.toEncoded() ); } } else diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index f0a2a6bfa80..e7cdf2fcc44 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -318,7 +318,7 @@ bool QgsApplication::notify( QObject *receiver, QEvent *event ) } catch ( std::exception &e ) { - QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) ); + QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromLatin1( e.what() ) ); if ( qApp->thread() == QThread::currentThread() ) QMessageBox::critical( activeWindow(), tr( "Exception" ), e.what() ); } diff --git a/src/core/qgsexpressionlexer.ll b/src/core/qgsexpressionlexer.ll index 1dc68b5a850..e617598c843 100644 --- a/src/core/qgsexpressionlexer.ll +++ b/src/core/qgsexpressionlexer.ll @@ -186,14 +186,14 @@ string "'"{str_char}*"'" "," { return COMMA; } -{num_float} { yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext) ); return NUMBER_FLOAT; } +{num_float} { yylval->numberFloat = cLocale.toDouble( QString::fromLatin1(yytext) ); return NUMBER_FLOAT; } {num_int} { bool ok; - yylval->numberInt = cLocale.toInt( QString::fromAscii(yytext), &ok ); + yylval->numberInt = cLocale.toInt( QString::fromLatin1(yytext), &ok ); if( ok ) return NUMBER_INT; - yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext), &ok ); + yylval->numberFloat = cLocale.toDouble( QString::fromLatin1(yytext), &ok ); if( ok ) return NUMBER_FLOAT; diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp index d950c5a2693..d0bcaeadc7a 100644 --- a/src/core/qgsmaplayer.cpp +++ b/src/core/qgsmaplayer.cpp @@ -257,7 +257,7 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr QUrl urlDest = QUrl::fromLocalFile( context.pathResolver().readPath( urlSource.toLocalFile() ) ); urlDest.setQueryItems( urlSource.queryItems() ); - mDataSource = QString::fromAscii( urlDest.toEncoded() ); + mDataSource = QString::fromLatin1( urlDest.toEncoded() ); } else if ( provider == QLatin1String( "wms" ) ) { @@ -621,7 +621,7 @@ bool QgsMapLayer::writeLayerXml( QDomElement &layerElement, QDomDocument &docume QUrl urlSource = QUrl::fromEncoded( src.toLatin1() ); QUrl urlDest = QUrl::fromLocalFile( context.pathResolver().writePath( urlSource.toLocalFile() ) ); urlDest.setQueryItems( urlSource.queryItems() ); - src = QString::fromAscii( urlDest.toEncoded() ); + src = QString::fromLatin1( urlDest.toEncoded() ); } else if ( vlayer && vlayer->providerType() == QLatin1String( "memory" ) ) { diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp index 3e930cab863..6ddbcdbd631 100644 --- a/src/core/qgsmaprenderercustompainterjob.cpp +++ b/src/core/qgsmaprenderercustompainterjob.cpp @@ -223,7 +223,7 @@ void QgsMapRendererCustomPainterJob::staticRender( QgsMapRendererCustomPainterJo catch ( std::exception &e ) { Q_UNUSED( e ); - QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) ); + QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromLatin1( e.what() ) ); } catch ( ... ) { diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp index d43a9a2ba8e..a4fb51bc834 100644 --- a/src/core/qgsmaprendererparalleljob.cpp +++ b/src/core/qgsmaprendererparalleljob.cpp @@ -263,7 +263,7 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob &job ) catch ( std::exception &e ) { Q_UNUSED( e ); - QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) ); + QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromLatin1( e.what() ) ); } catch ( ... ) { @@ -307,7 +307,7 @@ void QgsMapRendererParallelJob::renderLabelsStatic( QgsMapRendererParallelJob *s catch ( std::exception &e ) { Q_UNUSED( e ); - QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromAscii( e.what() ) ); + QgsDebugMsg( "Caught unhandled std::exception: " + QString::fromLatin1( e.what() ) ); } catch ( ... ) { diff --git a/src/core/qgssqlstatementlexer.ll b/src/core/qgssqlstatementlexer.ll index 06746541dfb..93336b819fb 100644 --- a/src/core/qgssqlstatementlexer.ll +++ b/src/core/qgssqlstatementlexer.ll @@ -164,18 +164,18 @@ string "'"{str_char}*"'" "," { return COMMA; } -{num_float} { yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext) ); return NUMBER_FLOAT; } +{num_float} { yylval->numberFloat = cLocale.toDouble( QString::fromLatin1(yytext) ); return NUMBER_FLOAT; } {num_int} { bool ok; - yylval->numberInt = cLocale.toInt( QString::fromAscii(yytext), &ok ); + yylval->numberInt = cLocale.toInt( QString::fromLatin1(yytext), &ok ); if( ok ) return NUMBER_INT; - yylval->numberInt64 = cLocale.toLongLong( QString::fromAscii(yytext), &ok ); + yylval->numberInt64 = cLocale.toLongLong( QString::fromLatin1(yytext), &ok ); if( ok ) return NUMBER_INT64; - yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext), &ok ); + yylval->numberFloat = cLocale.toDouble( QString::fromLatin1(yytext), &ok ); if( ok ) return NUMBER_FLOAT; diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp index ed7fca92b14..9c9f5c36531 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp @@ -115,7 +115,7 @@ void eVisDatabaseConnectionGui::drawNewVectorLayer( const QString &layerName, co url.addQueryItem( QStringLiteral( "delimiterType" ), QStringLiteral( "regexp" ) ); url.addQueryItem( QStringLiteral( "xField" ), xCoordinate ); url.addQueryItem( QStringLiteral( "yField" ), yCoordinate ); - emit drawVectorLayer( QString::fromAscii( url.toEncoded() ), layerName, QStringLiteral( "delimitedtext" ) ); + emit drawVectorLayer( QString::fromLatin1( url.toEncoded() ), layerName, QStringLiteral( "delimitedtext" ) ); mTempOutputFileList->last()->close(); } } diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 35a4285bda2..bd39fe30d55 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -1090,7 +1090,7 @@ void QgsDelimitedTextProvider::setUriParameter( const QString ¶meter, const QUrl url = QUrl::fromEncoded( dataSourceUri().toLatin1() ); if ( url.hasQueryItem( parameter ) ) url.removeAllQueryItems( parameter ); if ( ! value.isEmpty() ) url.addQueryItem( parameter, value ); - setDataSourceUri( QString::fromAscii( url.toEncoded() ) ); + setDataSourceUri( QString::fromLatin1( url.toEncoded() ) ); } void QgsDelimitedTextProvider::onFileUpdated() diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp index c20455d0b6c..f3e0a7e5ad1 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp @@ -193,7 +193,7 @@ void QgsDelimitedTextSourceSelect::addButtonClicked() // add the layer to the map - emit addVectorLayer( QString::fromAscii( url.toEncoded() ), txtLayerName->text() ); + emit addVectorLayer( QString::fromLatin1( url.toEncoded() ), txtLayerName->text() ); if ( widgetMode() == QgsProviderRegistry::WidgetMode::None ) { accept(); From 31fcc67a69156e017996e68ad21a9c557aea154c Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 13:55:25 +1000 Subject: [PATCH 2/8] Replace use of deprecated QHeaderView methods --- src/app/composer/qgsattributeselectiondialog.cpp | 4 ++-- src/app/composer/qgscomposer.cpp | 6 +++--- src/app/locator/qgslocatoroptionswidget.cpp | 2 +- src/app/qgsidentifyresultsdialog.cpp | 2 +- src/app/qgsprojectproperties.cpp | 6 +++--- src/app/qgsrasterlayerproperties.cpp | 4 ++-- src/gui/auth/qgsautheditorwidgets.cpp | 2 +- src/gui/qgsbrowserdockwidget.cpp | 2 +- src/gui/qgsorderbydialog.cpp | 6 +++--- src/gui/qgsprojectionselectiontreewidget.cpp | 8 ++++---- src/gui/qgstaskmanagerwidget.cpp | 2 +- src/gui/qgsvariableeditorwidget.cpp | 4 ++-- .../ui/qgsgeometrycheckerfixsummarydialog.cpp | 8 ++++---- src/plugins/grass/qgsgrassmoduleinput.cpp | 4 ++-- src/plugins/grass/qgsgrassnewmapset.cpp | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp index 911bb683cc4..6d0abc16f9d 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 394875ad291..11e09ac396a 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 c0c0add99df..8972c237ba6 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 d7be19d0cc2..262e39a9c0a 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 d443f9f91b3..1009c801401 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 9599b2ee90b..835093b31e4 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 b809c2a21a7..e7ea6f48b64 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 6dca2149f14..82b3f93d48b 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 efddb60c5c6..86664790423 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 4a09461beb8..5ec2d65037e 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 173054a08a7..a0e5c311122 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 e382a13c0ca..32072c6822a 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 b73186c4155..3ca612b9d34 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 f73ca596f67..ebd307f7031 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 dd096f1f601..9805d6c4b6a 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() ); From 422963e995970cfa6f43c7dd75cee25860e79134 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 13:57:21 +1000 Subject: [PATCH 3/8] Replace use of deprecated QMouseEvent::posF() --- src/app/qgsmaptoolannotation.cpp | 36 +++++++++++++++---------------- src/app/qgsmaptoolannotation.h | 2 +- src/gui/layout/qgslayoutruler.cpp | 4 ++-- src/gui/layout/qgslayoutruler.h | 2 +- src/gui/qgscolorwidgets.cpp | 8 +++---- src/gui/qgscomposerruler.cpp | 6 +++--- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp index feab0a943fe..e358c28efbc 100644 --- a/src/app/qgsmaptoolannotation.cpp +++ b/src/app/qgsmaptoolannotation.cpp @@ -94,12 +94,12 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e ) return; } - mLastMousePosition = e->posF(); + mLastMousePosition = e->pos(); QgsMapCanvasAnnotationItem *item = selectedItem(); if ( item ) { - mCurrentMoveAction = item->moveActionForPosition( e->posF() ); + mCurrentMoveAction = item->moveActionForPosition( e->pos() ); if ( mCurrentMoveAction != QgsMapCanvasAnnotationItem::NoAction ) { return; @@ -110,7 +110,7 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e ) { //select a new item if there is one at this position mCanvas->scene()->clearSelection(); - QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->posF() ); + QgsMapCanvasAnnotationItem *existingItem = itemAtPos( e->pos() ); if ( existingItem ) { existingItem->setSelected( true ); @@ -124,8 +124,8 @@ void QgsMapToolAnnotation::canvasPressEvent( QgsMapMouseEvent *e ) QgsPointXY mapPos = transformCanvasToAnnotation( toMapCoordinates( e->pos() ), annotation ); annotation->setMapPosition( mapPos ); annotation->setMapPositionCrs( mCanvas->mapSettings().destinationCrs() ); - annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(), - e->posF().y() / mCanvas->height() ) ); + annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(), + e->pos().y() / mCanvas->height() ) ); annotation->setFrameSize( QSizeF( 200, 100 ) ); QgsProject::instance()->annotationManager()->addAnnotation( annotation ); @@ -184,17 +184,17 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e ) { QgsPointXY mapPos = transformCanvasToAnnotation( e->snapPoint(), annotation ); annotation->setMapPosition( mapPos ); - annotation->setRelativePosition( QPointF( e->posF().x() / mCanvas->width(), - e->posF().y() / mCanvas->height() ) ); + annotation->setRelativePosition( QPointF( e->pos().x() / mCanvas->width(), + e->pos().y() / mCanvas->height() ) ); item->update(); QgsProject::instance()->setDirty( true ); } else if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::MoveFramePosition ) { - QPointF newCanvasPos = item->pos() + ( e->posF() - mLastMousePosition ); + QPointF newCanvasPos = item->pos() + ( e->pos() - mLastMousePosition ); if ( annotation->hasFixedMapPosition() ) { - annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->posF() - mLastMousePosition ) ); + annotation->setFrameOffsetFromReferencePoint( annotation->frameOffsetFromReferencePoint() + ( e->pos() - mLastMousePosition ) ); annotation->setRelativePosition( QPointF( newCanvasPos.x() / mCanvas->width(), newCanvasPos.y() / mCanvas->height() ) ); } @@ -223,27 +223,27 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e ) mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp ) { - xmax += e->posF().x() - mLastMousePosition.x(); + xmax += e->pos().x() - mLastMousePosition.x(); } if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeft || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp ) { - xmin += e->posF().x() - mLastMousePosition.x(); - relPosX = ( relPosX * mCanvas->width() + e->posF().x() - mLastMousePosition.x() ) / ( double )mCanvas->width(); + xmin += e->pos().x() - mLastMousePosition.x(); + relPosX = ( relPosX * mCanvas->width() + e->pos().x() - mLastMousePosition.x() ) / ( double )mCanvas->width(); } if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameUp || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftUp || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightUp ) { - ymin += e->posF().y() - mLastMousePosition.y(); - relPosY = ( relPosY * mCanvas->height() + e->posF().y() - mLastMousePosition.y() ) / ( double )mCanvas->height(); + ymin += e->pos().y() - mLastMousePosition.y(); + relPosY = ( relPosY * mCanvas->height() + e->pos().y() - mLastMousePosition.y() ) / ( double )mCanvas->height(); } if ( mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameDown || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameLeftDown || mCurrentMoveAction == QgsMapCanvasAnnotationItem::ResizeFrameRightDown ) { - ymax += e->posF().y() - mLastMousePosition.y(); + ymax += e->pos().y() - mLastMousePosition.y(); } //switch min / max if necessary @@ -270,18 +270,18 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent *e ) } else if ( item ) { - QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->posF() ); + QgsMapCanvasAnnotationItem::MouseMoveAction moveAction = item->moveActionForPosition( e->pos() ); if ( mCanvas ) { mCanvas->setCursor( QCursor( item->cursorShapeForAction( moveAction ) ) ); } } - mLastMousePosition = e->posF(); + mLastMousePosition = e->pos(); } void QgsMapToolAnnotation::canvasDoubleClickEvent( QgsMapMouseEvent *e ) { - QgsMapCanvasAnnotationItem *item = itemAtPos( e->posF() ); + QgsMapCanvasAnnotationItem *item = itemAtPos( e->pos() ); if ( !item ) { return; diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h index 605a585ac0a..79e6fd0ff0d 100644 --- a/src/app/qgsmaptoolannotation.h +++ b/src/app/qgsmaptoolannotation.h @@ -60,7 +60,7 @@ class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool QgsPointXY transformCanvasToAnnotation( QgsPointXY p, QgsAnnotation *annotation ) const; QgsMapCanvasAnnotationItem::MouseMoveAction mCurrentMoveAction = QgsMapCanvasAnnotationItem::NoAction; - QPointF mLastMousePosition = QPointF( 0, 0 ); + QPoint mLastMousePosition = QPoint( 0, 0 ); }; #endif // QGSMAPTOOLANNOTATION_H diff --git a/src/gui/layout/qgslayoutruler.cpp b/src/gui/layout/qgslayoutruler.cpp index a8ed5602747..c6a715a00f0 100644 --- a/src/gui/layout/qgslayoutruler.cpp +++ b/src/gui/layout/qgslayoutruler.cpp @@ -571,7 +571,7 @@ void QgsLayoutRuler::setCursorPosition( QPointF position ) void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event ) { - mMarkerPos = event->posF(); + mMarkerPos = event->pos(); update(); QPointF displayPos; @@ -651,7 +651,7 @@ void QgsLayoutRuler::mouseMoveEvent( QMouseEvent *event ) } //update cursor position in status bar - displayPos = mTransform.inverted().map( event->posF() ); + displayPos = mTransform.inverted().map( event->pos() ); switch ( mOrientation ) { case Qt::Horizontal: diff --git a/src/gui/layout/qgslayoutruler.h b/src/gui/layout/qgslayoutruler.h index 5f5945ea765..7cc4f238c93 100644 --- a/src/gui/layout/qgslayoutruler.h +++ b/src/gui/layout/qgslayoutruler.h @@ -104,7 +104,7 @@ class GUI_EXPORT QgsLayoutRuler: public QWidget QgsLayoutView *mView = nullptr; QTransform mTransform; - QPointF mMarkerPos; + QPoint mMarkerPos; QFont mRulerFont; std::unique_ptr< QFontMetrics > mRulerFontMetrics; diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp index 29e8caa363e..b030c3cf3d5 100644 --- a/src/gui/qgscolorwidgets.cpp +++ b/src/gui/qgscolorwidgets.cpp @@ -601,7 +601,7 @@ void QgsColorWheel::setColorFromPos( const QPointF pos ) void QgsColorWheel::mouseMoveEvent( QMouseEvent *event ) { - setColorFromPos( event->posF() ); + setColorFromPos( event->pos() ); QgsColorWidget::mouseMoveEvent( event ); } @@ -621,7 +621,7 @@ void QgsColorWheel::mousePressEvent( QMouseEvent *event ) { mClickedPart = QgsColorWheel::Wheel; } - setColorFromPos( event->posF() ); + setColorFromPos( event->pos() ); } void QgsColorWheel::mouseReleaseEvent( QMouseEvent *event ) @@ -1162,7 +1162,7 @@ void QgsColorRampWidget::setMarkerSize( const int markerSize ) void QgsColorRampWidget::mouseMoveEvent( QMouseEvent *event ) { - setColorFromPoint( event->posF() ); + setColorFromPoint( event->pos() ); QgsColorWidget::mouseMoveEvent( event ); } @@ -1191,7 +1191,7 @@ void QgsColorRampWidget::wheelEvent( QWheelEvent *event ) void QgsColorRampWidget::mousePressEvent( QMouseEvent *event ) { - setColorFromPoint( event->posF() ); + setColorFromPoint( event->pos() ); } void QgsColorRampWidget::keyPressEvent( QKeyEvent *event ) diff --git a/src/gui/qgscomposerruler.cpp b/src/gui/qgscomposerruler.cpp index 745f2bfa3d3..b3f39af1a0a 100644 --- a/src/gui/qgscomposerruler.cpp +++ b/src/gui/qgscomposerruler.cpp @@ -386,11 +386,11 @@ void QgsComposerRuler::setSceneTransform( const QTransform &transform ) void QgsComposerRuler::mouseMoveEvent( QMouseEvent *event ) { //qWarning( "QgsComposerRuler::mouseMoveEvent" ); - updateMarker( event->posF() ); - setSnapLinePosition( event->posF() ); + updateMarker( event->pos() ); + setSnapLinePosition( event->pos() ); //update cursor position in status bar - QPointF displayPos = mTransform.inverted().map( event->posF() ); + QPointF displayPos = mTransform.inverted().map( event->pos() ); if ( mDirection == Horizontal ) { //mouse is over a horizontal ruler, so don't show a y coordinate From 84774ee2ded210c1dab7b6ea46eacd0d5cb1cbbf Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 13:59:40 +1000 Subject: [PATCH 4/8] Replace use of qSort with std::sort --- src/app/nodetool/qgsnodetool.cpp | 2 +- src/core/qgsexpressionsorter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/nodetool/qgsnodetool.cpp b/src/app/nodetool/qgsnodetool.cpp index 9de9941975e..6a7b321a9c9 100644 --- a/src/app/nodetool/qgsnodetool.cpp +++ b/src/app/nodetool/qgsnodetool.cpp @@ -1601,7 +1601,7 @@ void QgsNodeTool::deleteVertex() QList &vertexIds = it2.value(); bool res = QgsVectorLayer::Success; - qSort( vertexIds.begin(), vertexIds.end(), qGreater() ); + std::sort( vertexIds.begin(), vertexIds.end(), std::greater() ); Q_FOREACH ( int vertexId, vertexIds ) { if ( res != QgsVectorLayer::EmptyGeometry ) diff --git a/src/core/qgsexpressionsorter.h b/src/core/qgsexpressionsorter.h index 2717d762d54..ad91196091f 100644 --- a/src/core/qgsexpressionsorter.h +++ b/src/core/qgsexpressionsorter.h @@ -160,7 +160,7 @@ class QgsExpressionSorter delete expressionContext->popScope(); - qSort( indexedFeatures.begin(), indexedFeatures.end(), *this ); + std::sort( indexedFeatures.begin(), indexedFeatures.end(), *this ); features.clear(); From 77c4edfbff422aaefd3deb95d329b7c6e7d889dd Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 14:00:49 +1000 Subject: [PATCH 5/8] Replace use of deprecated Qt::escape --- src/core/qgsstringutils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/qgsstringutils.cpp b/src/core/qgsstringutils.cpp index d35d5ee63ac..8accb752582 100644 --- a/src/core/qgsstringutils.cpp +++ b/src/core/qgsstringutils.cpp @@ -16,7 +16,6 @@ #include "qgsstringutils.h" #include #include -#include // for Qt::escape #include #include @@ -362,7 +361,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks ) { protoUrl.prepend( "http://" ); } - QString anchor = QStringLiteral( "%2" ).arg( Qt::escape( protoUrl ), Qt::escape( url ) ); + QString anchor = QStringLiteral( "%2" ).arg( protoUrl.toHtmlEscaped(), url.toHtmlEscaped() ); converted.replace( urlRegEx.pos( 1 ), url.length(), anchor ); offset = urlRegEx.pos( 1 ) + anchor.length(); } @@ -371,7 +370,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks ) { found = true; QString email = emailRegEx.cap( 1 ); - QString anchor = QStringLiteral( "%1" ).arg( Qt::escape( email ), Qt::escape( email ) ); + QString anchor = QStringLiteral( "%1" ).arg( email.toHtmlEscaped(), email.toHtmlEscaped() ); converted.replace( emailRegEx.pos( 1 ), email.length(), anchor ); offset = emailRegEx.pos( 1 ) + anchor.length(); } From b196d37c1e07156a917164e9dceef72c2abd772d Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 14:01:16 +1000 Subject: [PATCH 6/8] Replace use of deprecated QShortcut string operator --- src/gui/qgsshortcutsmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp index 0ecde77718d..18ad148e335 100644 --- a/src/gui/qgsshortcutsmanager.cpp +++ b/src/gui/qgsshortcutsmanager.cpp @@ -38,7 +38,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi QList< QAction * > actions = object->findChildren< QAction * >(); Q_FOREACH ( QAction *a, actions ) { - registerAction( a, a->shortcut() ); + registerAction( a, a->shortcut().toString() ); } } else @@ -47,7 +47,7 @@ void QgsShortcutsManager::registerAllChildActions( QObject *object, bool recursi { if ( QAction *a = qobject_cast( child ) ) { - registerAction( a, a->shortcut() ); + registerAction( a, a->shortcut().toString() ); } } } @@ -60,7 +60,7 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject *object, bool recur QList< QShortcut * > shortcuts = object->findChildren< QShortcut * >(); Q_FOREACH ( QShortcut *s, shortcuts ) { - registerShortcut( s, s->key() ); + registerShortcut( s, s->key().toString() ); } } else @@ -69,7 +69,7 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject *object, bool recur { if ( QShortcut *s = qobject_cast( child ) ) { - registerShortcut( s, s->key() ); + registerShortcut( s, s->key().toString() ); } } } From 83e685853948a887daef76f5821d65ffd8badb1e Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 14:02:15 +1000 Subject: [PATCH 7/8] Replace use of deprecated QSqlError::number --- src/providers/db2/qgsdb2dataitems.cpp | 6 +++--- src/providers/db2/qgsdb2geometrycolumns.cpp | 18 +++++++++--------- src/providers/db2/qgsdb2geometrycolumns.h | 4 ++-- src/providers/db2/qgsdb2provider.cpp | 10 +++++----- src/providers/db2/qgsdb2sourceselect.cpp | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/providers/db2/qgsdb2dataitems.cpp b/src/providers/db2/qgsdb2dataitems.cpp index 12c4e263272..a163b19f268 100644 --- a/src/providers/db2/qgsdb2dataitems.cpp +++ b/src/providers/db2/qgsdb2dataitems.cpp @@ -185,16 +185,16 @@ QVector QgsDb2ConnectionItem::createChildren() } QgsDb2GeometryColumns db2GC = QgsDb2GeometryColumns( db ); - int sqlcode = db2GC.open(); + QString sqlcode = db2GC.open(); /* Enabling the DB2 Spatial Extender creates the DB2GSE schema and tables, so the Extender is either not enabled or set up if SQLCODE -204 is returned. */ - if ( sqlcode == -204 ) + if ( sqlcode == QStringLiteral( "-204" ) ) { children.append( new QgsErrorItem( this, tr( "DB2 Spatial Extender is not enabled or set up." ), mPath + "/error" ) ); return children; } - else if ( sqlcode != 0 ) + else if ( !sqlcode.isEmpty() && sqlcode != QStringLiteral( "0" ) ) { children.append( new QgsErrorItem( this, db.lastError().text(), mPath + "/error" ) ); return children; diff --git a/src/providers/db2/qgsdb2geometrycolumns.cpp b/src/providers/db2/qgsdb2geometrycolumns.cpp index 894335aa8ed..d0accb9e33e 100644 --- a/src/providers/db2/qgsdb2geometrycolumns.cpp +++ b/src/providers/db2/qgsdb2geometrycolumns.cpp @@ -32,12 +32,12 @@ QgsDb2GeometryColumns::~QgsDb2GeometryColumns() mQuery.clear(); } -int QgsDb2GeometryColumns::open() +QString QgsDb2GeometryColumns::open() { return open( QString(), QString() ); } -int QgsDb2GeometryColumns::open( const QString &schemaName, const QString &tableName ) +QString QgsDb2GeometryColumns::open( const QString &schemaName, const QString &tableName ) { QString queryExtents( "SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME, TYPE_NAME, " "SRS_ID, SRS_NAME, MIN_X, MIN_Y, MAX_X, MAX_Y " @@ -46,7 +46,7 @@ int QgsDb2GeometryColumns::open( const QString &schemaName, const QString &table "SRS_ID, SRS_NAME " "FROM DB2GSE.ST_GEOMETRY_COLUMNS" ); mQuery = QSqlQuery( mDatabase ); - int sqlcode = 0; + QString nativeError; mEnvironment = ENV_LUW; if ( !schemaName.isEmpty() && !tableName.isEmpty() ) @@ -61,30 +61,30 @@ int QgsDb2GeometryColumns::open( const QString &schemaName, const QString &table if ( !mQuery.exec( queryExtents ) ) { QgsDebugMsg( "ST_Geometry_Columns query failed: " + mDatabase.lastError().text() ); - sqlcode = mQuery.lastError().number(); - QgsDebugMsg( QString( "SQLCODE: %1" ).arg( sqlcode ) ); + nativeError = mQuery.lastError().nativeErrorCode(); + QgsDebugMsg( QString( "SQLCODE: %1" ).arg( nativeError ) ); /* The MIN_X, MIN_Y, MAX_X, and MAX_Y columns are not available on z/OS (and LUW 9.5) so SQLCODE -206 is returned when specifying non-existent columns. */ - if ( mQuery.lastError().number() == -206 ) + if ( mQuery.lastError().nativeErrorCode() == QStringLiteral( "-206" ) ) { QgsDebugMsg( "Try query with no extents" ); mQuery.clear(); if ( !mQuery.exec( queryNoExtents ) ) { - QgsDebugMsg( QString( "SQLCODE: %1" ).arg( mQuery.lastError().number() ) ); + QgsDebugMsg( QString( "SQLCODE: %1" ).arg( mQuery.lastError().nativeErrorCode() ) ); } else { QgsDebugMsg( "success; must be z/OS" ); mEnvironment = ENV_ZOS; - sqlcode = 0; + nativeError.clear(); } } } // QgsDebugMsg( QString( "sqlcode: %1" ).arg( sqlcode ) ); - return sqlcode; + return nativeError; } bool QgsDb2GeometryColumns::isActive() diff --git a/src/providers/db2/qgsdb2geometrycolumns.h b/src/providers/db2/qgsdb2geometrycolumns.h index 8da8d31db62..1f3488935b7 100644 --- a/src/providers/db2/qgsdb2geometrycolumns.h +++ b/src/providers/db2/qgsdb2geometrycolumns.h @@ -37,8 +37,8 @@ class QgsDb2GeometryColumns // clazy:exclude=rule-of-three bool isActive(); void close(); - int open(); - int open( const QString &schemaName, const QString &tableName ); + QString open(); + QString open( const QString &schemaName, const QString &tableName ); bool populateLayerProperty( QgsDb2LayerProperty &layer ); int db2Environment(); diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp index ad6ab4b412d..e880db93e0b 100644 --- a/src/providers/db2/qgsdb2provider.cpp +++ b/src/providers/db2/qgsdb2provider.cpp @@ -583,8 +583,8 @@ void QgsDb2Provider::updateStatistics() const QgsDebugMsg( QString( "mSRId: %1" ).arg( mSRId ) ); QgsDb2GeometryColumns gc( mDatabase ); - int rc = gc.open( mSchemaName, mTableName ); // returns SQLCODE if failure - if ( rc == 0 ) + QString rc = gc.open( mSchemaName, mTableName ); // returns SQLCODE if failure + if ( rc.isEmpty() || rc == QStringLiteral( "0" ) ) { mEnvironment = gc.db2Environment(); if ( -1 == mSRId ) @@ -1394,7 +1394,7 @@ QgsVectorLayerExporter::ExportError QgsDb2Provider::createEmptyLayer( const QStr sql = "DROP TABLE " + fullName; if ( !q.exec( sql ) ) { - if ( q.lastError().number() != -206 ) // -206 is "not found" just ignore + if ( q.lastError().nativeErrorCode() != QStringLiteral( "-206" ) ) // -206 is "not found" just ignore { QString lastError = q.lastError().text(); QgsDebugMsg( lastError ); @@ -1498,8 +1498,8 @@ QgsVectorLayerExporter::ExportError QgsDb2Provider::createEmptyLayer( const QStr // get the environment QgsDb2GeometryColumns gc( db ); - int rc = gc.open( schemaName, tableName ); // returns SQLCODE if failure - if ( rc == 0 ) + QString rc = gc.open( schemaName, tableName ); // returns SQLCODE if failure + if ( rc.isEmpty() || rc == QStringLiteral( "0" ) ) { db2Environment = gc.db2Environment(); } diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp index d17d32b7bca..f7c24251d74 100644 --- a/src/providers/db2/qgsdb2sourceselect.cpp +++ b/src/providers/db2/qgsdb2sourceselect.cpp @@ -495,8 +495,8 @@ void QgsDb2SourceSelect::on_btnConnect_clicked() } QgsDb2GeometryColumns db2GC = QgsDb2GeometryColumns( db ); - int sqlcode = db2GC.open(); - if ( 0 != sqlcode ) + QString sqlcode = db2GC.open(); + if ( !sqlcode.isEmpty() && QStringLiteral( "0" ) != sqlcode ) { QMessageBox::warning( this, tr( "DB2GSE.ST_GEOMETRY_COLUMNS Not Found" ), tr( "DB2GSE.ST_GEOMETRY_COLUMNS not found. The DB2 Spatial Extender is not enabled or set up." ) ); From 1b5fbf98fed23fe400a6534f3861abe239495c32 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Sep 2017 14:03:16 +1000 Subject: [PATCH 8/8] Replace use of qCopy --- src/plugins/grass/qtermwidget/History.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/grass/qtermwidget/History.cpp b/src/plugins/grass/qtermwidget/History.cpp index f49b00becad..9830bd7c383 100644 --- a/src/plugins/grass/qtermwidget/History.cpp +++ b/src/plugins/grass/qtermwidget/History.cpp @@ -314,7 +314,7 @@ void HistoryScrollBuffer::addCellsVector(const QVector& cells) void HistoryScrollBuffer::addCells(const Character a[], int count) { HistoryLine newLine(count); - qCopy(a,a+count,newLine.begin()); + std::copy(a,a+count,newLine.begin()); addCellsVector(newLine); } @@ -730,7 +730,7 @@ void CompactHistoryScroll::addCellsVector ( const TextLine& cells ) void CompactHistoryScroll::addCells ( const Character a[], int count ) { TextLine newLine ( count ); - qCopy ( a,a+count,newLine.begin() ); + std::copy ( a,a+count,newLine.begin() ); addCellsVector ( newLine ); }