Fix rename variable

qgis · Aug 3, 2018 · f893192 · f893192
1 parent 16706bb
commit f893192
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3570,7 +3570,7 @@ static QVariant fcnGetFeatureById( const QVariantList &values, const QgsExpressi
     QgsFeatureRequest req;
     req.setFilterFid( fid );
     req.setConnectionTimeout( 10000 );
-    req.setFreeConnectionsRequirement( 1 );
+    req.setRequestMayBeNested( true );
     QgsFeatureIterator fIt = vl->getFeatures( req );
 
     QgsFeature fet;
@@ -3612,7 +3612,7 @@ static QVariant fcnGetFeature( const QVariantList &values, const QgsExpressionCo
                            QgsExpression::quotedString( attVal.toString() ) ) );
   req.setLimit( 1 );
   req.setConnectionTimeout( 10000 );
-  req.setFreeConnectionsRequirement( 1 );
+  req.setRequestMayBeNested( true );
   if ( !parent->needsGeometry() )
   {
     req.setFlags( QgsFeatureRequest::NoGeometry );

diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -86,7 +86,7 @@ QgsFeatureRequest &QgsFeatureRequest::operator=( const QgsFeatureRequest &rh )
   mCrs = rh.mCrs;
   mTransformErrorCallback = rh.mTransformErrorCallback;
   mConnectionTimeout = rh.mConnectionTimeout;
-  mFreeConnectionsRequirement = rh.mFreeConnectionsRequirement;
+  mRequestMayBeNested = rh.mRequestMayBeNested;
   return *this;
 }