Remove const from count method

nyalldawson · nyalldawson · commit 811145eb96cb · 2018-01-05T11:15:04.000+10:00
diff --git a/python/core/layout/qgsabstractlayoutiterator.sip b/python/core/layout/qgsabstractlayoutiterator.sip
@@ -46,7 +46,7 @@ is available or required.
 Ends the render, performing any required cleanup tasks.
 %End
 
-    virtual int count() const = 0;
+    virtual int count() = 0;
 %Docstring
 Returns the number of features to iterate over.
 %End
diff --git a/python/core/layout/qgslayoutatlas.sip b/python/core/layout/qgslayoutatlas.sip
@@ -268,7 +268,7 @@ number of matching features.
 
     virtual bool endRender();
 
-    virtual int count() const;
+    virtual int count();
 
     virtual QString filePath( const QString &baseFilePath, const QString &extension );
 
diff --git a/python/core/qgsexpressioncontext.sip b/python/core/qgsexpressioncontext.sip
@@ -1053,7 +1053,7 @@ For instance, current page name and number.
 :param atlas: source atlas. If null, a set of default atlas variables will be added to the scope.
 %End
 
-    static QgsExpressionContextScope *atlasScope( const QgsLayoutAtlas *atlas ) /Factory/;
+    static QgsExpressionContextScope *atlasScope( QgsLayoutAtlas *atlas ) /Factory/;
 %Docstring
 Creates a new scope which contains variables and functions relating to a :py:class:`QgsLayoutAtlas`.
 For instance, current page name and number.
diff --git a/src/core/layout/qgsabstractlayoutiterator.h b/src/core/layout/qgsabstractlayoutiterator.h
@@ -48,7 +48,7 @@ class CORE_EXPORT QgsAbstractLayoutIterator
     /**
      * Returns the number of features to iterate over.
      */
-    virtual int count() const = 0;
+    virtual int count() = 0;
 
     /**
      * Iterates to next feature, returning false if no more features exist to iterate over.
diff --git a/src/core/layout/qgslayoutatlas.cpp b/src/core/layout/qgslayoutatlas.cpp
@@ -334,7 +334,7 @@ bool QgsLayoutAtlas::endRender()
   return true;
 }
 
-int QgsLayoutAtlas::count() const
+int QgsLayoutAtlas::count()
 {
   return mFeatureIds.size();
 }
diff --git a/src/core/layout/qgslayoutatlas.h b/src/core/layout/qgslayoutatlas.h
@@ -241,7 +241,7 @@ class CORE_EXPORT QgsLayoutAtlas : public QObject, public QgsAbstractLayoutItera
 
     bool beginRender() override;
     bool endRender() override;
-    int count() const override;
+    int count() override;
     QString filePath( const QString &baseFilePath, const QString &extension ) override;
 
     /**
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -1222,7 +1222,7 @@ QgsExpressionContextScope *QgsExpressionContextUtils::compositionAtlasScope( con
   return scope;
 }
 
-QgsExpressionContextScope *QgsExpressionContextUtils::atlasScope( const QgsLayoutAtlas *atlas )
+QgsExpressionContextScope *QgsExpressionContextUtils::atlasScope( QgsLayoutAtlas *atlas )
 {
   QgsExpressionContextScope *scope = new QgsExpressionContextScope( QObject::tr( "Atlas" ) );
   if ( !atlas )
diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
@@ -935,7 +935,7 @@ class CORE_EXPORT QgsExpressionContextUtils
      * For instance, current page name and number.
      * \param atlas source atlas. If null, a set of default atlas variables will be added to the scope.
      */
-    static QgsExpressionContextScope *atlasScope( const QgsLayoutAtlas *atlas ) SIP_FACTORY;
+    static QgsExpressionContextScope *atlasScope( QgsLayoutAtlas *atlas ) SIP_FACTORY;
 
     /**
      * Creates a new scope which contains variables and functions relating to a QgsComposerItem.

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ bool QgsLayoutAtlas::endRender()`
`334`	`334`	`return true;`
`335`	`335`	`}`
`336`	`336`
`337`		`-int QgsLayoutAtlas::count() const`
	`337`	`+int QgsLayoutAtlas::count()`
`338`	`338`	`{`
`339`	`339`	`return mFeatureIds.size();`
`340`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,7 @@ QgsExpressionContextScope *QgsExpressionContextUtils::compositionAtlasScope( con`
`1222`	`1222`	`return scope;`
`1223`	`1223`	`}`
`1224`	`1224`
`1225`		`-QgsExpressionContextScope QgsExpressionContextUtils::atlasScope( const QgsLayoutAtlas atlas )`
	`1225`	`+QgsExpressionContextScope QgsExpressionContextUtils::atlasScope( QgsLayoutAtlas atlas )`
`1226`	`1226`	`{`
`1227`	`1227`	`QgsExpressionContextScope *scope = new QgsExpressionContextScope( QObject::tr( "Atlas" ) );`
`1228`	`1228`	`if ( !atlas )`