Replace use of deprecated methods

nyalldawson · nyalldawson · commit 1d62de3f1b76 · 2018-08-18T16:53:32.000+10:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3605,7 +3605,7 @@ static QVariant fcnGetFeatureById( const QVariantList &values, const QgsExpressi
 
     QgsFeatureRequest req;
     req.setFilterFid( fid );
-    req.setConnectionTimeout( 10000 );
+    req.setTimeout( 10000 );
     req.setRequestMayBeNested( true );
     QgsFeatureIterator fIt = vl->getFeatures( req );
 
@@ -3648,7 +3648,7 @@ static QVariant fcnGetFeature( const QVariantList &values, const QgsExpressionCo
   req.setFilterExpression( QStringLiteral( "%1=%2" ).arg( QgsExpression::quotedColumnRef( attribute ),
                            QgsExpression::quotedString( attVal.toString() ) ) );
   req.setLimit( 1 );
-  req.setConnectionTimeout( 10000 );
+  req.setTimeout( 10000 );
   req.setRequestMayBeNested( true );
   if ( !parent->needsGeometry() )
   {
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   , mSharedDS( source->mSharedDS )
 {
   // Since connection timeout for OGR connections is problematic and can lead to crashes, disable for now.
-  mRequest.setConnectionTimeout( -1 );
+  mRequest.setTimeout( -1 );
   if ( mSharedDS )
   {
     mOgrLayer = mSharedDS->createSQLResultLayer( mSource->mEncoding, mSource->mLayerName, mSource->mLayerIndex );
@@ -58,7 +58,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   else
   {
     //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
-    mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );
+    mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.timeout(), mRequest.requestMayBeNested() );
     if ( !mConn || !mConn->ds )
     {
       return;
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -38,7 +38,7 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource
 
   if ( !source->mTransactionConnection )
   {
-    mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo, request.connectionTimeout(), request.requestMayBeNested() );
+    mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo, request.timeout(), request.requestMayBeNested() );
     mIsTransactionConnection = false;
   }
   else
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -29,7 +29,7 @@
 QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeatureSource *source, bool ownSource, const QgsFeatureRequest &request )
   : QgsAbstractFeatureIteratorFromSource<QgsSpatiaLiteFeatureSource>( source, ownSource, request )
 {
-  mHandle = QgsSpatiaLiteConnPool::instance()->acquireConnection( mSource->mSqlitePath, request.connectionTimeout(), request.requestMayBeNested() );
+  mHandle = QgsSpatiaLiteConnPool::instance()->acquireConnection( mSource->mSqlitePath, request.timeout(), request.requestMayBeNested() );
 
   mFetchGeometry = !mSource->mGeometryColumn.isNull() && !( mRequest.flags() & QgsFeatureRequest::NoGeometry );
   mHasPrimaryKey = !mSource->mPrimaryKey.isEmpty();
diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -1291,10 +1291,10 @@ bool QgsWFSFeatureIterator::fetchFeature( QgsFeature &f )
     QTimer timer( this );
     timer.start( 50 );
     QTimer requestTimeout( this );
-    if ( mRequest.connectionTimeout() > 0 )
+    if ( mRequest.timeout() > 0 )
     {
       connect( &requestTimeout, &QTimer::timeout, this, &QgsWFSFeatureIterator::timeout );
-      requestTimeout.start( mRequest.connectionTimeout() );
+      requestTimeout.start( mRequest.timeout() );
     }
     if ( mInterruptionChecker )
       connect( &timer, &QTimer::timeout, this, &QgsWFSFeatureIterator::checkInterruption );
diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -366,7 +366,7 @@ def testTimeout(self):
         available in the connection pool
         """
         request = QgsFeatureRequest()
-        request.setConnectionTimeout(1)
+        request.setTimeout(1)
 
         iterators = list()
         for i in range(100):

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool`
`46`	`46`	`, mSharedDS( source->mSharedDS )`
`47`	`47`	`{`
`48`	`48`	`// Since connection timeout for OGR connections is problematic and can lead to crashes, disable for now.`
`49`		`- mRequest.setConnectionTimeout( -1 );`
	`49`	`+ mRequest.setTimeout( -1 );`
`50`	`50`	`if ( mSharedDS )`
`51`	`51`	`{`
`52`	`52`	`mOgrLayer = mSharedDS->createSQLResultLayer( mSource->mEncoding, mSource->mLayerName, mSource->mLayerIndex );`
`@@ -58,7 +58,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool`
`58`	`58`	`else`
`59`	`59`	`{`
`60`	`60`	`//QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");`
`61`		`- mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );`
	`61`	`+ mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.timeout(), mRequest.requestMayBeNested() );`
`62`	`62`	`if ( !mConn \|\| !mConn->ds )`
`63`	`63`	`{`
`64`	`64`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource`
`38`	`38`
`39`	`39`	`if ( !source->mTransactionConnection )`
`40`	`40`	`{`
`41`		`- mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo, request.connectionTimeout(), request.requestMayBeNested() );`
	`41`	`+ mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo, request.timeout(), request.requestMayBeNested() );`
`42`	`42`	`mIsTransactionConnection = false;`
`43`	`43`	`}`
`44`	`44`	`else`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeatureSource *source, bool ownSource, const QgsFeatureRequest &request )`
`30`	`30`	`: QgsAbstractFeatureIteratorFromSource<QgsSpatiaLiteFeatureSource>( source, ownSource, request )`
`31`	`31`	`{`
`32`		`- mHandle = QgsSpatiaLiteConnPool::instance()->acquireConnection( mSource->mSqlitePath, request.connectionTimeout(), request.requestMayBeNested() );`
	`32`	`+ mHandle = QgsSpatiaLiteConnPool::instance()->acquireConnection( mSource->mSqlitePath, request.timeout(), request.requestMayBeNested() );`
`33`	`33`
`34`	`34`	`mFetchGeometry = !mSource->mGeometryColumn.isNull() && !( mRequest.flags() & QgsFeatureRequest::NoGeometry );`
`35`	`35`	`mHasPrimaryKey = !mSource->mPrimaryKey.isEmpty();`
Original file line number	Diff line number	Diff line change
`@@ -1291,10 +1291,10 @@ bool QgsWFSFeatureIterator::fetchFeature( QgsFeature &f )`
`1291`	`1291`	`QTimer timer( this );`
`1292`	`1292`	`timer.start( 50 );`
`1293`	`1293`	`QTimer requestTimeout( this );`
`1294`		`- if ( mRequest.connectionTimeout() > 0 )`
	`1294`	`+ if ( mRequest.timeout() > 0 )`
`1295`	`1295`	`{`
`1296`	`1296`	`connect( &requestTimeout, &QTimer::timeout, this, &QgsWFSFeatureIterator::timeout );`
`1297`		`- requestTimeout.start( mRequest.connectionTimeout() );`
	`1297`	`+ requestTimeout.start( mRequest.timeout() );`
`1298`	`1298`	`}`
`1299`	`1299`	`if ( mInterruptionChecker )`
`1300`	`1300`	`connect( &timer, &QTimer::timeout, this, &QgsWFSFeatureIterator::checkInterruption );`