@@ -4310,61 +4310,59 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
4310
4310
4311
4311
<< new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_match" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " string" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " regex" ) ), fcnRegexpMatch, QStringList () << QStringLiteral ( " Conditionals" ) << QStringLiteral ( " String" ) )
4312
4312
<< new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_matches" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " string" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " regex" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " emptyvalue" ), true , " " ), fcnRegexpMatches, QStringLiteral ( " Arrays" ) )
4313
- ;
4314
- auto function = new QgsStaticExpressionFunction ( QStringLiteral ( " now" ), 0 , fcnNow, QStringLiteral ( " Date and Time" ), QString (), false , QSet<QString>(), false , QStringList () << QStringLiteral ( " $now" ) );
4315
- function->setIsStatic ( true );
4316
- sFunctions << function;
4317
- sFunctions << new QgsStaticExpressionFunction ( QStringLiteral ( " age" ), 2 , fcnAge, QStringLiteral ( " Date and Time" ) )
4318
- << new QgsStaticExpressionFunction ( QStringLiteral ( " year" ), 1 , fcnYear, QStringLiteral ( " Date and Time" ) )
4319
- << new QgsStaticExpressionFunction ( QStringLiteral ( " month" ), 1 , fcnMonth, QStringLiteral ( " Date and Time" ) )
4320
- << new QgsStaticExpressionFunction ( QStringLiteral ( " week" ), 1 , fcnWeek, QStringLiteral ( " Date and Time" ) )
4321
- << new QgsStaticExpressionFunction ( QStringLiteral ( " day" ), 1 , fcnDay, QStringLiteral ( " Date and Time" ) )
4322
- << new QgsStaticExpressionFunction ( QStringLiteral ( " hour" ), 1 , fcnHour, QStringLiteral ( " Date and Time" ) )
4323
- << new QgsStaticExpressionFunction ( QStringLiteral ( " minute" ), 1 , fcnMinute, QStringLiteral ( " Date and Time" ) )
4324
- << new QgsStaticExpressionFunction ( QStringLiteral ( " second" ), 1 , fcnSeconds, QStringLiteral ( " Date and Time" ) )
4325
- << new QgsStaticExpressionFunction ( QStringLiteral ( " epoch" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " date" ) ), fcnEpoch, QStringLiteral ( " Date and Time" ) )
4326
- << new QgsStaticExpressionFunction ( QStringLiteral ( " day_of_week" ), 1 , fcnDayOfWeek, QStringLiteral ( " Date and Time" ) )
4327
- << new QgsStaticExpressionFunction ( QStringLiteral ( " lower" ), 1 , fcnLower, QStringLiteral ( " String" ) )
4328
- << new QgsStaticExpressionFunction ( QStringLiteral ( " upper" ), 1 , fcnUpper, QStringLiteral ( " String" ) )
4329
- << new QgsStaticExpressionFunction ( QStringLiteral ( " title" ), 1 , fcnTitle, QStringLiteral ( " String" ) )
4330
- << new QgsStaticExpressionFunction ( QStringLiteral ( " trim" ), 1 , fcnTrim, QStringLiteral ( " String" ) )
4331
- << new QgsStaticExpressionFunction ( QStringLiteral ( " levenshtein" ), 2 , fcnLevenshtein, QStringLiteral ( " Fuzzy Matching" ) )
4332
- << new QgsStaticExpressionFunction ( QStringLiteral ( " longest_common_substring" ), 2 , fcnLCS, QStringLiteral ( " Fuzzy Matching" ) )
4333
- << new QgsStaticExpressionFunction ( QStringLiteral ( " hamming_distance" ), 2 , fcnHamming, QStringLiteral ( " Fuzzy Matching" ) )
4334
- << new QgsStaticExpressionFunction ( QStringLiteral ( " soundex" ), 1 , fcnSoundex, QStringLiteral ( " Fuzzy Matching" ) )
4335
- << new QgsStaticExpressionFunction ( QStringLiteral ( " char" ), 1 , fcnChar, QStringLiteral ( " String" ) )
4336
- << new QgsStaticExpressionFunction ( QStringLiteral ( " wordwrap" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " text" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " length" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " delimiter" ), true , " " ), fcnWordwrap, QStringLiteral ( " String" ) )
4337
- << new QgsStaticExpressionFunction ( QStringLiteral ( " length" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " text" ), true , " " ), fcnLength, QStringList () << QStringLiteral ( " String" ) << QStringLiteral ( " GeometryGroup" ) )
4338
- << new QgsStaticExpressionFunction ( QStringLiteral ( " replace" ), -1 , fcnReplace, QStringLiteral ( " String" ) )
4339
- << new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_replace" ), 3 , fcnRegexpReplace, QStringLiteral ( " String" ) )
4340
- << new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_substr" ), 2 , fcnRegexpSubstr, QStringLiteral ( " String" ) )
4341
- << new QgsStaticExpressionFunction ( QStringLiteral ( " substr" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " string" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " start " ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " length" ), true ), fcnSubstr, QStringLiteral ( " String" ), QString (),
4342
- false , QSet< QString >(), false , QStringList (), true )
4343
- << new QgsStaticExpressionFunction ( QStringLiteral ( " concat" ), -1 , fcnConcat, QStringLiteral ( " String" ), QString (), false , QSet<QString>(), false , QStringList (), true )
4344
- << new QgsStaticExpressionFunction ( QStringLiteral ( " strpos" ), 2 , fcnStrpos, QStringLiteral ( " String" ) )
4345
- << new QgsStaticExpressionFunction ( QStringLiteral ( " left" ), 2 , fcnLeft, QStringLiteral ( " String" ) )
4346
- << new QgsStaticExpressionFunction ( QStringLiteral ( " right" ), 2 , fcnRight, QStringLiteral ( " String" ) )
4347
- << new QgsStaticExpressionFunction ( QStringLiteral ( " rpad" ), 3 , fcnRPad, QStringLiteral ( " String" ) )
4348
- << new QgsStaticExpressionFunction ( QStringLiteral ( " lpad" ), 3 , fcnLPad, QStringLiteral ( " String" ) )
4349
- << new QgsStaticExpressionFunction ( QStringLiteral ( " format" ), -1 , fcnFormatString, QStringLiteral ( " String" ) )
4350
- << new QgsStaticExpressionFunction ( QStringLiteral ( " format_number" ), 2 , fcnFormatNumber, QStringLiteral ( " String" ) )
4351
- << new QgsStaticExpressionFunction ( QStringLiteral ( " format_date" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " date" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " format" ) ), fcnFormatDate, QStringList () << QStringLiteral ( " String" ) << QStringLiteral ( " Date and Time" ) )
4352
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_grayscale_average" ), 1 , fcnColorGrayscaleAverage, QStringLiteral ( " Color" ) )
4353
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_mix_rgb" ), 3 , fcnColorMixRgb, QStringLiteral ( " Color" ) )
4354
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_rgb" ), 3 , fcnColorRgb, QStringLiteral ( " Color" ) )
4355
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_rgba" ), 4 , fncColorRgba, QStringLiteral ( " Color" ) )
4356
- << new QgsStaticExpressionFunction ( QStringLiteral ( " ramp_color" ), 2 , fcnRampColor, QStringLiteral ( " Color" ) )
4357
- << new QgsStaticExpressionFunction ( QStringLiteral ( " create_ramp" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " map" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " discrete" ), true , false ), fcnCreateRamp, QStringLiteral ( " Color" ) )
4358
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsl" ), 3 , fcnColorHsl, QStringLiteral ( " Color" ) )
4359
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsla" ), 4 , fncColorHsla, QStringLiteral ( " Color" ) )
4360
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsv" ), 3 , fcnColorHsv, QStringLiteral ( " Color" ) )
4361
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsva" ), 4 , fncColorHsva, QStringLiteral ( " Color" ) )
4362
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_cmyk" ), 4 , fcnColorCmyk, QStringLiteral ( " Color" ) )
4363
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_cmyka" ), 5 , fncColorCmyka, QStringLiteral ( " Color" ) )
4364
- << new QgsStaticExpressionFunction ( QStringLiteral ( " color_part" ), 2 , fncColorPart, QStringLiteral ( " Color" ) )
4365
- << new QgsStaticExpressionFunction ( QStringLiteral ( " darker" ), 2 , fncDarker, QStringLiteral ( " Color" ) )
4366
- << new QgsStaticExpressionFunction ( QStringLiteral ( " lighter" ), 2 , fncLighter, QStringLiteral ( " Color" ) )
4367
- << new QgsStaticExpressionFunction ( QStringLiteral ( " set_color_part" ), 3 , fncSetColorPart, QStringLiteral ( " Color" ) );
4313
+
4314
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " now" ), 0 , fcnNow, QStringLiteral ( " Date and Time" ), QString (), false , QSet<QString>(), false , QStringList () << QStringLiteral ( " $now" ) )
4315
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " age" ), 2 , fcnAge, QStringLiteral ( " Date and Time" ) )
4316
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " year" ), 1 , fcnYear, QStringLiteral ( " Date and Time" ) )
4317
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " month" ), 1 , fcnMonth, QStringLiteral ( " Date and Time" ) )
4318
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " week" ), 1 , fcnWeek, QStringLiteral ( " Date and Time" ) )
4319
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " day" ), 1 , fcnDay, QStringLiteral ( " Date and Time" ) )
4320
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " hour" ), 1 , fcnHour, QStringLiteral ( " Date and Time" ) )
4321
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " minute" ), 1 , fcnMinute, QStringLiteral ( " Date and Time" ) )
4322
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " second" ), 1 , fcnSeconds, QStringLiteral ( " Date and Time" ) )
4323
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " epoch" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " date" ) ), fcnEpoch, QStringLiteral ( " Date and Time" ) )
4324
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " day_of_week" ), 1 , fcnDayOfWeek, QStringLiteral ( " Date and Time" ) )
4325
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " lower" ), 1 , fcnLower, QStringLiteral ( " String" ) )
4326
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " upper" ), 1 , fcnUpper, QStringLiteral ( " String" ) )
4327
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " title" ), 1 , fcnTitle, QStringLiteral ( " String" ) )
4328
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " trim" ), 1 , fcnTrim, QStringLiteral ( " String" ) )
4329
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " levenshtein" ), 2 , fcnLevenshtein, QStringLiteral ( " Fuzzy Matching" ) )
4330
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " longest_common_substring" ), 2 , fcnLCS, QStringLiteral ( " Fuzzy Matching" ) )
4331
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " hamming_distance" ), 2 , fcnHamming, QStringLiteral ( " Fuzzy Matching" ) )
4332
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " soundex" ), 1 , fcnSoundex, QStringLiteral ( " Fuzzy Matching" ) )
4333
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " char" ), 1 , fcnChar, QStringLiteral ( " String" ) )
4334
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " wordwrap" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " text" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " length" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " delimiter" ), true , " " ), fcnWordwrap, QStringLiteral ( " String" ) )
4335
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " length" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " text" ), true , " " ), fcnLength, QStringList () << QStringLiteral ( " String" ) << QStringLiteral ( " GeometryGroup" ) )
4336
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " replace" ), -1 , fcnReplace, QStringLiteral ( " String" ) )
4337
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_replace" ), 3 , fcnRegexpReplace, QStringLiteral ( " String" ) )
4338
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " regexp_substr" ), 2 , fcnRegexpSubstr, QStringLiteral ( " String" ) )
4339
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " substr" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " string" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " start " ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " length" ), true ), fcnSubstr, QStringLiteral ( " String" ), QString (),
4340
+ false , QSet< QString >(), false , QStringList (), true )
4341
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " concat" ), -1 , fcnConcat, QStringLiteral ( " String" ), QString (), false , QSet<QString>(), false , QStringList (), true )
4342
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " strpos" ), 2 , fcnStrpos, QStringLiteral ( " String" ) )
4343
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " left" ), 2 , fcnLeft, QStringLiteral ( " String" ) )
4344
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " right" ), 2 , fcnRight, QStringLiteral ( " String" ) )
4345
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " rpad" ), 3 , fcnRPad, QStringLiteral ( " String" ) )
4346
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " lpad" ), 3 , fcnLPad, QStringLiteral ( " String" ) )
4347
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " format" ), -1 , fcnFormatString, QStringLiteral ( " String" ) )
4348
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " format_number" ), 2 , fcnFormatNumber, QStringLiteral ( " String" ) )
4349
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " format_date" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " date" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " format" ) ), fcnFormatDate, QStringList () << QStringLiteral ( " String" ) << QStringLiteral ( " Date and Time" ) )
4350
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_grayscale_average" ), 1 , fcnColorGrayscaleAverage, QStringLiteral ( " Color" ) )
4351
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_mix_rgb" ), 3 , fcnColorMixRgb, QStringLiteral ( " Color" ) )
4352
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_rgb" ), 3 , fcnColorRgb, QStringLiteral ( " Color" ) )
4353
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_rgba" ), 4 , fncColorRgba, QStringLiteral ( " Color" ) )
4354
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " ramp_color" ), 2 , fcnRampColor, QStringLiteral ( " Color" ) )
4355
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " create_ramp" ), QgsExpressionFunction::ParameterList () << QgsExpressionFunction::Parameter ( QStringLiteral ( " map" ) ) << QgsExpressionFunction::Parameter ( QStringLiteral ( " discrete" ), true , false ), fcnCreateRamp, QStringLiteral ( " Color" ) )
4356
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsl" ), 3 , fcnColorHsl, QStringLiteral ( " Color" ) )
4357
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsla" ), 4 , fncColorHsla, QStringLiteral ( " Color" ) )
4358
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsv" ), 3 , fcnColorHsv, QStringLiteral ( " Color" ) )
4359
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_hsva" ), 4 , fncColorHsva, QStringLiteral ( " Color" ) )
4360
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_cmyk" ), 4 , fcnColorCmyk, QStringLiteral ( " Color" ) )
4361
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_cmyka" ), 5 , fncColorCmyka, QStringLiteral ( " Color" ) )
4362
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " color_part" ), 2 , fncColorPart, QStringLiteral ( " Color" ) )
4363
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " darker" ), 2 , fncDarker, QStringLiteral ( " Color" ) )
4364
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " lighter" ), 2 , fncLighter, QStringLiteral ( " Color" ) )
4365
+ << new QgsStaticExpressionFunction ( QStringLiteral ( " set_color_part" ), 3 , fncSetColorPart, QStringLiteral ( " Color" ) );
4368
4366
4369
4367
QgsStaticExpressionFunction *geomFunc = new QgsStaticExpressionFunction ( QStringLiteral ( " $geometry" ), 0 , fcnGeometry, QStringLiteral ( " GeometryGroup" ), QString (), true );
4370
4368
geomFunc->setIsStatic ( false );
0 commit comments