Skip to content

Commit a259d9f

Browse files
nyalldawsonnyalldawson
committedJul 3, 2017
Fix silly logic error identified by Coverity
·
ltr-3_40final-3_0_0
1 parent 4c52db9 commit a259d9f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed
 

‎src/core/processing/qgsprocessingparameters.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ QString QgsProcessingParameterDefinition::valueAsPythonString( const QVariant &v
920920
QString QgsProcessingParameterDefinition::asScriptCode() const
921921
{
922922
QString code = QStringLiteral( "##%1=" ).arg( mName );
923-
if ( mFlags && FlagOptional )
923+
if ( mFlags & FlagOptional )
924924
code += QStringLiteral( "optional " );
925925
code += type() + ' ';
926926
code += mDefault.toString();
@@ -963,7 +963,7 @@ QString QgsProcessingParameterBoolean::valueAsPythonString( const QVariant &val,
963963
QString QgsProcessingParameterBoolean::asScriptCode() const
964964
{
965965
QString code = QStringLiteral( "##%1=" ).arg( mName );
966-
if ( mFlags && FlagOptional )
966+
if ( mFlags & FlagOptional )
967967
code += QStringLiteral( "optional " );
968968
code += type() + ' ';
969969
code += mDefault.toBool() ? QStringLiteral( "true" ) : QStringLiteral( "false" );
@@ -1216,7 +1216,7 @@ bool QgsProcessingParameterFile::checkValueIsAcceptable( const QVariant &input,
12161216
QString QgsProcessingParameterFile::asScriptCode() const
12171217
{
12181218
QString code = QStringLiteral( "##%1=" ).arg( mName );
1219-
if ( mFlags && FlagOptional )
1219+
if ( mFlags & FlagOptional )
12201220
code += QStringLiteral( "optional " );
12211221
code += ( mBehavior == File ? QStringLiteral( "file" ) : QStringLiteral( "folder" ) ) + ' ';
12221222
code += mDefault.toString();
@@ -1457,7 +1457,7 @@ QString QgsProcessingParameterMultipleLayers::valueAsPythonString( const QVarian
14571457
QString QgsProcessingParameterMultipleLayers::asScriptCode() const
14581458
{
14591459
QString code = QStringLiteral( "##%1=" ).arg( mName );
1460-
if ( mFlags && FlagOptional )
1460+
if ( mFlags & FlagOptional )
14611461
code += QStringLiteral( "optional " );
14621462
switch ( mLayerType )
14631463
{
@@ -1881,7 +1881,7 @@ QString QgsProcessingParameterEnum::valueAsPythonString( const QVariant &value,
18811881
QString QgsProcessingParameterEnum::asScriptCode() const
18821882
{
18831883
QString code = QStringLiteral( "##%1=" ).arg( mName );
1884-
if ( mFlags && FlagOptional )
1884+
if ( mFlags & FlagOptional )
18851885
code += QStringLiteral( "optional " );
18861886
code += QStringLiteral( "enum " );
18871887

@@ -1973,7 +1973,7 @@ QString QgsProcessingParameterString::valueAsPythonString( const QVariant &value
19731973
QString QgsProcessingParameterString::asScriptCode() const
19741974
{
19751975
QString code = QStringLiteral( "##%1=" ).arg( mName );
1976-
if ( mFlags && FlagOptional )
1976+
if ( mFlags & FlagOptional )
19771977
code += QStringLiteral( "optional " );
19781978
code += QStringLiteral( "string " );
19791979

@@ -2206,7 +2206,7 @@ QString QgsProcessingParameterField::valueAsPythonString( const QVariant &value,
22062206
QString QgsProcessingParameterField::asScriptCode() const
22072207
{
22082208
QString code = QStringLiteral( "##%1=" ).arg( mName );
2209-
if ( mFlags && FlagOptional )
2209+
if ( mFlags & FlagOptional )
22102210
code += QStringLiteral( "optional " );
22112211
code += QStringLiteral( "field " );
22122212

@@ -2408,7 +2408,7 @@ QString QgsProcessingParameterFeatureSource::valueAsPythonString( const QVariant
24082408
QString QgsProcessingParameterFeatureSource::asScriptCode() const
24092409
{
24102410
QString code = QStringLiteral( "##%1=" ).arg( mName );
2411-
if ( mFlags && FlagOptional )
2411+
if ( mFlags & FlagOptional )
24122412
code += QStringLiteral( "optional " );
24132413
code += QStringLiteral( "source " );
24142414

@@ -2556,7 +2556,7 @@ QString QgsProcessingParameterFeatureSink::valueAsPythonString( const QVariant &
25562556
QString QgsProcessingParameterFeatureSink::asScriptCode() const
25572557
{
25582558
QString code = QStringLiteral( "##%1=" ).arg( mName );
2559-
if ( mFlags && FlagOptional )
2559+
if ( mFlags & FlagOptional )
25602560
code += QStringLiteral( "optional " );
25612561
code += QStringLiteral( "sink " );
25622562

@@ -2977,7 +2977,7 @@ QString QgsProcessingParameterVectorOutput::valueAsPythonString( const QVariant
29772977
QString QgsProcessingParameterVectorOutput::asScriptCode() const
29782978
{
29792979
QString code = QStringLiteral( "##%1=" ).arg( mName );
2980-
if ( mFlags && FlagOptional )
2980+
if ( mFlags & FlagOptional )
29812981
code += QStringLiteral( "optional " );
29822982
code += QStringLiteral( "vectorOut " );
29832983

0 commit comments

Comments
 (0)
Please sign in to comment.