Rename postpone option in lazy

pblottiere · pblottiere · commit c2a2f3328831 · 2018-03-02T09:43:26.000Z
diff --git a/python/core/qgsvirtuallayerdefinition.sip.in b/python/core/qgsvirtuallayerdefinition.sip.in
@@ -150,19 +150,19 @@ Get the name of the field with unique identifiers
 Set the name of the field with unique identifiers
 %End
 
-    void setPostpone( bool postpone );
+    void setLazy( bool lazy );
 %Docstring
-Sets the postpone mode. If ``postpone`` is true, then the loading is
+Sets the lazy mode. If ``lazy`` is true, then the loading is
 delayed until an explicit reloading of the layer.
 
-:param postpone: True to delay the loading, false otherwise
+:param lazy: True to delay the loading, false otherwise
 
 .. versionadded:: 3.2
 %End
 
-    bool postpone() const;
+    bool isLazy() const;
 %Docstring
-Returns the postpone mode.
+Returns the lazy mode.
 
 :return: True if the loading is delayed, false otherwise.
 
diff --git a/src/core/qgsvirtuallayerdefinition.cpp b/src/core/qgsvirtuallayerdefinition.cpp
@@ -157,9 +157,9 @@ QgsVirtualLayerDefinition QgsVirtualLayerDefinition::fromUrl( const QUrl &url )
         }
       }
     }
-    else if ( key == QLatin1String( "postpone" ) )
+    else if ( key == QLatin1String( "lazy" ) )
     {
-      def.setPostpone( true );
+      def.setLazy( true );
     }
   }
   def.setFields( fields );
@@ -213,9 +213,9 @@ QUrl QgsVirtualLayerDefinition::toUrl() const
       url.addQueryItem( QStringLiteral( "field" ), f.name() + ":text" );
   }
 
-  if ( postpone() )
+  if ( isLazy() )
   {
-    url.addQueryItem( QStringLiteral( "postpone" ), QLatin1String( "" ) );
+    url.addQueryItem( QStringLiteral( "lazy" ), QLatin1String( "" ) );
   }
 
   return url;
diff --git a/src/core/qgsvirtuallayerdefinition.h b/src/core/qgsvirtuallayerdefinition.h
@@ -132,19 +132,19 @@ class CORE_EXPORT QgsVirtualLayerDefinition
     void setUid( const QString &uid ) { mUid = uid; }
 
     /**
-     * Sets the postpone mode. If \a postpone is true, then the loading is
+     * Sets the lazy mode. If \a lazy is true, then the loading is
      * delayed until an explicit reloading of the layer.
-     * \param postpone True to delay the loading, false otherwise
+     * \param lazy True to delay the loading, false otherwise
      * \since QGIS 3.2
      */
-    void setPostpone( bool postpone ) { mPostpone = postpone; }
+    void setLazy( bool lazy ) { mLazy = lazy; }
 
     /**
-     * Returns the postpone mode.
+     * Returns the lazy mode.
      * \returns True if the loading is delayed, false otherwise.
      * \since QGIS 3.2
      */
-    bool postpone() const { return mPostpone; }
+    bool isLazy() const { return mLazy; }
 
     //! Get the name of the geometry field. Empty if no geometry field
     QString geometryField() const { return mGeometryField; }
@@ -189,7 +189,7 @@ class CORE_EXPORT QgsVirtualLayerDefinition
     QString mGeometryField;
     QString mFilePath;
     QgsFields mFields;
-    bool mPostpone = false;
+    bool mLazy = false;
     QgsWkbTypes::Type mGeometryWkbType = QgsWkbTypes::Unknown;
     long mGeometrySrid = 0;
 };
diff --git a/src/core/qgsvirtuallayertask.cpp b/src/core/qgsvirtuallayertask.cpp
@@ -22,7 +22,7 @@ QgsVirtualLayerTask::QgsVirtualLayerTask( const QgsVirtualLayerDefinition &defin
   : QgsTask()
   , mDefinition( definition )
 {
-  mDefinition.setPostpone( true );
+  mDefinition.setLazy( true );
   mLayer = qgis::make_unique<QgsVectorLayer>( mDefinition.toString(), "layer", "virtual" );
 }
 
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -76,7 +76,7 @@ QgsVirtualLayerProvider::QgsVirtualLayerProvider( QString const &uri )
   {
     mDefinition = QgsVirtualLayerDefinition::fromUrl( url );
 
-    if ( !mDefinition.postpone() )
+    if ( !mDefinition.isLazy() )
     {
       reloadData();
     }

Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,9 @@ QgsVirtualLayerDefinition QgsVirtualLayerDefinition::fromUrl( const QUrl &url )`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- else if ( key == QLatin1String( "postpone" ) )`
	`160`	`+ else if ( key == QLatin1String( "lazy" ) )`
`161`	`161`	`{`
`162`		`- def.setPostpone( true );`
	`162`	`+ def.setLazy( true );`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`def.setFields( fields );`
`@@ -213,9 +213,9 @@ QUrl QgsVirtualLayerDefinition::toUrl() const`
`213`	`213`	`url.addQueryItem( QStringLiteral( "field" ), f.name() + ":text" );`
`214`	`214`	`}`
`215`	`215`
`216`		`- if ( postpone() )`
	`216`	`+ if ( isLazy() )`
`217`	`217`	`{`
`218`		`- url.addQueryItem( QStringLiteral( "postpone" ), QLatin1String( "" ) );`
	`218`	`+ url.addQueryItem( QStringLiteral( "lazy" ), QLatin1String( "" ) );`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`return url;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ QgsVirtualLayerTask::QgsVirtualLayerTask( const QgsVirtualLayerDefinition &defin`
`22`	`22`	`: QgsTask()`
`23`	`23`	`, mDefinition( definition )`
`24`	`24`	`{`
`25`		`- mDefinition.setPostpone( true );`
	`25`	`+ mDefinition.setLazy( true );`
`26`	`26`	`mLayer = qgis::make_unique<QgsVectorLayer>( mDefinition.toString(), "layer", "virtual" );`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ QgsVirtualLayerProvider::QgsVirtualLayerProvider( QString const &uri )`
`76`	`76`	`{`
`77`	`77`	`mDefinition = QgsVirtualLayerDefinition::fromUrl( url );`
`78`	`78`
`79`		`- if ( !mDefinition.postpone() )`
	`79`	`+ if ( !mDefinition.isLazy() )`
`80`	`80`	`{`
`81`	`81`	`reloadData();`
`82`	`82`	`}`