Fix warnings

qgis · May 1, 2017 · c929d2a · c929d2a
1 parent 7ee1cbf
commit c929d2a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -1005,7 +1005,7 @@ Creates a deep copy of this list. Ownership is transferred to the caller
 
         NodeUnaryOperator( QgsExpression::UnaryOperator op, QgsExpression::Node *operand /Transfer/ );
 %Docstring
- A node unary operator is modifying the value of ``operand`` by negating it with \op.
+ A node unary operator is modifying the value of ``operand`` by negating it with ``op``.
 %End
         ~NodeUnaryOperator();
 
@@ -1091,7 +1091,7 @@ Creates a deep copy of this list. Ownership is transferred to the caller
 
         NodeInOperator( QgsExpression::Node *node /Transfer/, QgsExpression::NodeList *list /Transfer/, bool notin = false );
 %Docstring
- This node tests if the result of \node is in the result of ``list``. Optionally it can be inverted with ``notin`` which by default is false.
+ This node tests if the result of ``node`` is in the result of ``list``. Optionally it can be inverted with ``notin`` which by default is false.
 %End
         virtual ~NodeInOperator();
 

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -6310,7 +6310,7 @@ bool QgsExpression::Function::operator==( const QgsExpression::Function &other )
   return ( QString::compare( mName, other.mName, Qt::CaseInsensitive ) == 0 );
 }
 
-QgsExpression::StaticFunction::StaticFunction( const QString &fnname, const QgsExpression::ParameterList &params, QgsExpression::FcnEval fcn, const QString &group, const QString &helpText, std::function < bool ( const NodeFunction *node ) > usesGeometry, std::function < QSet<QString>( const NodeFunction *node ) > referencedColumns, bool lazyEval, const QStringList &aliases, bool handlesNull )
+QgsExpression::StaticFunction::StaticFunction( const QString &fnname, const QgsExpression::ParameterList &params, QgsExpression::FcnEval fcn, const QString &group, const QString &helpText, std::function < bool ( const QgsExpression::NodeFunction *node ) > usesGeometry, std::function < QSet<QString>( const QgsExpression::NodeFunction *node ) > referencedColumns, bool lazyEval, const QStringList &aliases, bool handlesNull )
   : Function( fnname, params, group, helpText, lazyEval, handlesNull )
   , mFnc( fcn )
   , mAliases( aliases )

diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -1063,7 +1063,7 @@ class CORE_EXPORT QgsExpression
       public:
 
         /**
-         * A node unary operator is modifying the value of \a operand by negating it with \op.
+         * A node unary operator is modifying the value of \a operand by negating it with \a op.
          */
         NodeUnaryOperator( QgsExpression::UnaryOperator op, QgsExpression::Node *operand SIP_TRANSFER )
           : mOp( op )
@@ -1148,7 +1148,7 @@ class CORE_EXPORT QgsExpression
       public:
 
         /**
-         * This node tests if the result of \node is in the result of \a list. Optionally it can be inverted with \a notin which by default is false.
+         * This node tests if the result of \a node is in the result of \a list. Optionally it can be inverted with \a notin which by default is false.
          */
         NodeInOperator( QgsExpression::Node *node SIP_TRANSFER, QgsExpression::NodeList *list SIP_TRANSFER, bool notin = false )
           : mNode( node )