@@ -4230,7 +4230,7 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
4230
4230
4231
4231
sFunctions
4232
4232
<< new QgsStaticExpressionFunction ( QStringLiteral ( " env" ), 1 , fcnEnvVar, QStringLiteral ( " General" ), QString () )
4233
- << new QgsSetVariableExpressionFunction ()
4233
+ << new QgsWithVariableExpressionFunction ()
4234
4234
<< new QgsStaticExpressionFunction ( QStringLiteral ( " attribute" ), 2 , fcnAttribute, QStringLiteral ( " Record" ), QString (), false , QSet<QString>() << QgsFeatureRequest::ALL_ATTRIBUTES )
4235
4235
4236
4236
// functions for arrays
@@ -4276,13 +4276,13 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
4276
4276
return sFunctions ;
4277
4277
}
4278
4278
4279
- QgsSetVariableExpressionFunction::QgsSetVariableExpressionFunction ()
4280
- : QgsExpressionFunction( " set_variable " , 3 , QCoreApplication::tr( " General" ), "help text TODODOODO" )
4279
+ QgsWithVariableExpressionFunction::QgsWithVariableExpressionFunction ()
4280
+ : QgsExpressionFunction( QStringLiteral( " with_variable " ) , 3, QCoreApplication::tr( " General" ) )
4281
4281
{
4282
4282
4283
4283
}
4284
4284
4285
- bool QgsSetVariableExpressionFunction ::isStatic ( const QgsExpressionNodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const
4285
+ bool QgsWithVariableExpressionFunction ::isStatic ( const QgsExpressionNodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const
4286
4286
{
4287
4287
bool isStatic = false ;
4288
4288
@@ -4310,7 +4310,7 @@ bool QgsSetVariableExpressionFunction::isStatic( const QgsExpressionNodeFunction
4310
4310
return false ;
4311
4311
}
4312
4312
4313
- QVariant QgsSetVariableExpressionFunction ::run ( QgsExpressionNode::NodeList *args, const QgsExpressionContext *context, QgsExpression *parent )
4313
+ QVariant QgsWithVariableExpressionFunction ::run ( QgsExpressionNode::NodeList *args, const QgsExpressionContext *context, QgsExpression *parent )
4314
4314
{
4315
4315
QVariant result;
4316
4316
@@ -4332,7 +4332,7 @@ QVariant QgsSetVariableExpressionFunction::run( QgsExpressionNode::NodeList *arg
4332
4332
return result;
4333
4333
}
4334
4334
4335
- QVariant QgsSetVariableExpressionFunction ::func ( const QVariantList &values, const QgsExpressionContext *context, QgsExpression *parent )
4335
+ QVariant QgsWithVariableExpressionFunction ::func ( const QVariantList &values, const QgsExpressionContext *context, QgsExpression *parent )
4336
4336
{
4337
4337
// This is a dummy function, all the real handling is in run
4338
4338
Q_UNUSED ( values )
@@ -4343,7 +4343,7 @@ QVariant QgsSetVariableExpressionFunction::func( const QVariantList &values, con
4343
4343
return QVariant ();
4344
4344
}
4345
4345
4346
- bool QgsSetVariableExpressionFunction ::prepare ( const QgsExpressionNodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const
4346
+ bool QgsWithVariableExpressionFunction ::prepare ( const QgsExpressionNodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ) const
4347
4347
{
4348
4348
QgsExpressionNode::NodeList *args = node->args ();
4349
4349
0 commit comments