sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add convenience method QgsVectorLayer::getFeatures( expression )

Browse Source
This commit is contained in:
Matthias Kuhn 2015-04-23 16:10:54 +02:00
parent 6952a389ea
commit 9b6e23d3af
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/qgsexpression.sip
View File

@ -225,11 +225,9 @@ class QgsExpression
};
static const QList<QgsExpression::Function *> &Functions();
// static QList<Function*> gmFunctions;
static const QList<QgsExpression::Function *>& Functions();
// static QStringList gmBuiltinFunctions;
static const QStringList &BuiltinFunctions();
static const QStringList& BuiltinFunctions();
static bool registerFunction( Function* function );
static bool unregisterFunction( QString name );

4
src/core/qgsexpression.cpp
View File

@ -1657,7 +1657,7 @@ bool QgsExpression::unregisterFunction( QString name )
QStringList QgsExpression::gmBuiltinFunctions;
const QStringList &QgsExpression::BuiltinFunctions()
const QStringList& QgsExpression::BuiltinFunctions()
{
if ( gmBuiltinFunctions.isEmpty() )
{
@ -1700,7 +1700,7 @@ const QStringList &QgsExpression::BuiltinFunctions()
QList<QgsExpression::Function*> QgsExpression::gmFunctions;
const QList<QgsExpression::Function*> &QgsExpression::Functions()
const QList<QgsExpression::Function*>& QgsExpression::Functions()
{
if ( gmFunctions.isEmpty() )
{

8
src/core/qgsexpression.h
View File

@ -352,11 +352,11 @@ class CORE_EXPORT QgsExpression
QStringList mAliases;
};
static const QList<Function*> &Functions();
static QList<Function*> gmFunctions;
static const QList<Function*>& Functions();
static QStringList gmBuiltinFunctions;
static const QStringList &BuiltinFunctions();
static const QStringList& BuiltinFunctions();
static bool registerFunction( Function* function );
static bool unregisterFunction( QString name );
@ -574,7 +574,11 @@ class CORE_EXPORT QgsExpression
public:
NodeLiteral( QVariant value ) : mValue( value ) {}
<<<<<<< HEAD
QVariant value() const { return mValue; }
=======
inline QVariant value() const { return mValue; }
>>>>>>> c943e22... Revert "Add convenience method QgsVectorLayer::getFeatures( expression )"
virtual NodeType nodeType() const override { return ntLiteral; }
virtual bool prepare( QgsExpression* parent, const QgsFields &fields ) override;