Skip to content

Commit

Permalink
Remove const from count method
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 5, 2018
1 parent 4d2f0de commit 811145e
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion python/core/layout/qgsabstractlayoutiterator.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/core/layout/qgslayoutatlas.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsexpressioncontext.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgsabstractlayoutiterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutatlas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ bool QgsLayoutAtlas::endRender()
return true;
}

int QgsLayoutAtlas::count() const
int QgsLayoutAtlas::count()
{
return mFeatureIds.size();
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutatlas.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsexpressioncontext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsexpressioncontext.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 811145e

Please sign in to comment.