Skip to content

Commit 053fe62

Browse files
committedJun 2, 2020
Fix various instances of cppcheck 'clarifyCalculation' warning about operator precedence
1 parent 41120d7 commit 053fe62

File tree

9 files changed

+37
-37
lines changed

9 files changed

+37
-37
lines changed
 

‎src/analysis/vector/qgszonalstatistics.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,31 +173,31 @@ int QgsZonalStatistics::calculateStatistics( QgsFeedback *feedback )
173173
vectorProvider->addAttributes( newFieldList );
174174

175175
//index of the new fields
176-
int countIndex = mStatistics & QgsZonalStatistics::Count ? vectorProvider->fieldNameIndex( countFieldName ) : -1;
177-
int sumIndex = mStatistics & QgsZonalStatistics::Sum ? vectorProvider->fieldNameIndex( sumFieldName ) : -1;
178-
int meanIndex = mStatistics & QgsZonalStatistics::Mean ? vectorProvider->fieldNameIndex( meanFieldName ) : -1;
179-
int medianIndex = mStatistics & QgsZonalStatistics::Median ? vectorProvider->fieldNameIndex( medianFieldName ) : -1;
180-
int stdevIndex = mStatistics & QgsZonalStatistics::StDev ? vectorProvider->fieldNameIndex( stdevFieldName ) : -1;
181-
int minIndex = mStatistics & QgsZonalStatistics::Min ? vectorProvider->fieldNameIndex( minFieldName ) : -1;
182-
int maxIndex = mStatistics & QgsZonalStatistics::Max ? vectorProvider->fieldNameIndex( maxFieldName ) : -1;
183-
int rangeIndex = mStatistics & QgsZonalStatistics::Range ? vectorProvider->fieldNameIndex( rangeFieldName ) : -1;
184-
int minorityIndex = mStatistics & QgsZonalStatistics::Minority ? vectorProvider->fieldNameIndex( minorityFieldName ) : -1;
185-
int majorityIndex = mStatistics & QgsZonalStatistics::Majority ? vectorProvider->fieldNameIndex( majorityFieldName ) : -1;
186-
int varietyIndex = mStatistics & QgsZonalStatistics::Variety ? vectorProvider->fieldNameIndex( varietyFieldName ) : -1;
187-
int varianceIndex = mStatistics & QgsZonalStatistics::Variance ? vectorProvider->fieldNameIndex( varianceFieldName ) : -1;
188-
189-
if ( ( mStatistics & QgsZonalStatistics::Count && countIndex == -1 )
190-
|| ( mStatistics & QgsZonalStatistics::Sum && sumIndex == -1 )
191-
|| ( mStatistics & QgsZonalStatistics::Mean && meanIndex == -1 )
192-
|| ( mStatistics & QgsZonalStatistics::Median && medianIndex == -1 )
193-
|| ( mStatistics & QgsZonalStatistics::StDev && stdevIndex == -1 )
194-
|| ( mStatistics & QgsZonalStatistics::Min && minIndex == -1 )
195-
|| ( mStatistics & QgsZonalStatistics::Max && maxIndex == -1 )
196-
|| ( mStatistics & QgsZonalStatistics::Range && rangeIndex == -1 )
197-
|| ( mStatistics & QgsZonalStatistics::Minority && minorityIndex == -1 )
198-
|| ( mStatistics & QgsZonalStatistics::Majority && majorityIndex == -1 )
199-
|| ( mStatistics & QgsZonalStatistics::Variety && varietyIndex == -1 )
200-
|| ( mStatistics & QgsZonalStatistics::Variance && varianceIndex == -1 )
176+
int countIndex = ( mStatistics & QgsZonalStatistics::Count ) ? vectorProvider->fieldNameIndex( countFieldName ) : -1;
177+
int sumIndex = ( mStatistics & QgsZonalStatistics::Sum ) ? vectorProvider->fieldNameIndex( sumFieldName ) : -1;
178+
int meanIndex = ( mStatistics & QgsZonalStatistics::Mean ) ? vectorProvider->fieldNameIndex( meanFieldName ) : -1;
179+
int medianIndex = ( mStatistics & QgsZonalStatistics::Median ) ? vectorProvider->fieldNameIndex( medianFieldName ) : -1;
180+
int stdevIndex = ( mStatistics & QgsZonalStatistics::StDev ) ? vectorProvider->fieldNameIndex( stdevFieldName ) : -1;
181+
int minIndex = ( mStatistics & QgsZonalStatistics::Min ) ? vectorProvider->fieldNameIndex( minFieldName ) : -1;
182+
int maxIndex = ( mStatistics & QgsZonalStatistics::Max ) ? vectorProvider->fieldNameIndex( maxFieldName ) : -1;
183+
int rangeIndex = ( mStatistics & QgsZonalStatistics::Range ) ? vectorProvider->fieldNameIndex( rangeFieldName ) : -1;
184+
int minorityIndex = ( mStatistics & QgsZonalStatistics::Minority ) ? vectorProvider->fieldNameIndex( minorityFieldName ) : -1;
185+
int majorityIndex = ( mStatistics & QgsZonalStatistics::Majority ) ? vectorProvider->fieldNameIndex( majorityFieldName ) : -1;
186+
int varietyIndex = ( mStatistics & QgsZonalStatistics::Variety ) ? vectorProvider->fieldNameIndex( varietyFieldName ) : -1;
187+
int varianceIndex = ( mStatistics & QgsZonalStatistics::Variance ) ? vectorProvider->fieldNameIndex( varianceFieldName ) : -1;
188+
189+
if ( ( ( mStatistics & QgsZonalStatistics::Count ) && countIndex == -1 )
190+
|| ( ( mStatistics & QgsZonalStatistics::Sum ) && sumIndex == -1 )
191+
|| ( ( mStatistics & QgsZonalStatistics::Mean ) && meanIndex == -1 )
192+
|| ( ( mStatistics & QgsZonalStatistics::Median ) && medianIndex == -1 )
193+
|| ( ( mStatistics & QgsZonalStatistics::StDev ) && stdevIndex == -1 )
194+
|| ( ( mStatistics & QgsZonalStatistics::Min ) && minIndex == -1 )
195+
|| ( ( mStatistics & QgsZonalStatistics::Max ) && maxIndex == -1 )
196+
|| ( ( mStatistics & QgsZonalStatistics::Range ) && rangeIndex == -1 )
197+
|| ( ( mStatistics & QgsZonalStatistics::Minority ) && minorityIndex == -1 )
198+
|| ( ( mStatistics & QgsZonalStatistics::Majority ) && majorityIndex == -1 )
199+
|| ( ( mStatistics & QgsZonalStatistics::Variety ) && varietyIndex == -1 )
200+
|| ( ( mStatistics & QgsZonalStatistics::Variance ) && varianceIndex == -1 )
201201
)
202202
{
203203
//failed to create a required field

‎src/app/dwg/qgsdwgimporter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ bool QgsDwgImporter::curveFromLWPolyline( const DRW_LWPolyline &data, QgsCompoun
14701470

14711471
QgsPointSequence s;
14721472
bool hadBulge( data.vertlist[0]->bulge != 0.0 );
1473-
std::vector<DRW_Vertex2D *>::size_type n = data.flags & 1 ? vertexnum + 1 : vertexnum;
1473+
std::vector<DRW_Vertex2D *>::size_type n = ( data.flags & 1 ) ? vertexnum + 1 : vertexnum;
14741474
for ( std::vector<DRW_Vertex2D *>::size_type i = 0; i < n; i++ )
14751475
{
14761476
size_t i0 = i % vertexnum;
@@ -1539,7 +1539,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
15391539
double width = -1.0; // width is set to correct value during first loop
15401540
bool hadBulge( false );
15411541

1542-
std::vector<DRW_Vertex2D *>::size_type n = data.flags & 1 ? vertexnum : vertexnum - 1;
1542+
std::vector<DRW_Vertex2D *>::size_type n = ( data.flags & 1 ) ? vertexnum : vertexnum - 1;
15431543
for ( std::vector<DRW_Vertex2D *>::size_type i = 0; i < n; i++ )
15441544
{
15451545
size_t i0 = i % vertexnum;
@@ -1739,7 +1739,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
17391739
double width = -1.0; // width is set to correct value during first loop
17401740
bool hadBulge( false );
17411741

1742-
std::vector<DRW_Vertex *>::size_type n = data.flags & 1 ? vertexnum : vertexnum - 1;
1742+
std::vector<DRW_Vertex *>::size_type n = ( data.flags & 1 ) ? vertexnum : vertexnum - 1;
17431743
for ( std::vector<DRW_Vertex *>::size_type i = 0; i < n; i++ )
17441744
{
17451745
size_t i0 = i % vertexnum;

‎src/core/processing/models/qgsprocessingmodelalgorithm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ QVariantMap QgsProcessingModelAlgorithm::processAlgorithm( const QVariantMap &pa
348348
QVariantMap results = childAlg->run( childParams, context, &modelFeedback, &ok, child.configuration() );
349349
if ( !ok )
350350
{
351-
const QString error = childAlg->flags() & QgsProcessingAlgorithm::FlagCustomException ? QString() : QObject::tr( "Error encountered while running %1" ).arg( child.description() );
351+
const QString error = ( childAlg->flags() & QgsProcessingAlgorithm::FlagCustomException ) ? QString() : QObject::tr( "Error encountered while running %1" ).arg( child.description() );
352352
throw QgsProcessingException( error );
353353
}
354354
childResults.insert( childId, results );

‎src/core/qgsfeaturesource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ QgsFeatureIds QgsFeatureSource::allFeatureIds() const
131131

132132
QgsVectorLayer *QgsFeatureSource::materialize( const QgsFeatureRequest &request, QgsFeedback *feedback )
133133
{
134-
QgsWkbTypes::Type outWkbType = request.flags() & QgsFeatureRequest::NoGeometry ? QgsWkbTypes::NoGeometry : wkbType();
134+
QgsWkbTypes::Type outWkbType = ( request.flags() & QgsFeatureRequest::NoGeometry ) ? QgsWkbTypes::NoGeometry : wkbType();
135135
QgsCoordinateReferenceSystem crs = request.destinationCrs().isValid() ? request.destinationCrs() : sourceCrs();
136136

137137
QgsAttributeList requestedAttrs = request.subsetOfAttributes();

‎src/core/qgsfield.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ QString QgsField::displayType( const bool showConstraints ) const
114114

115115
if ( showConstraints )
116116
{
117-
typeStr += constraints().constraints() & QgsFieldConstraints::ConstraintNotNull
117+
typeStr += ( constraints().constraints() & QgsFieldConstraints::ConstraintNotNull )
118118
? QStringLiteral( " NOT NULL" )
119119
: QStringLiteral( " NULL" );
120120

121-
typeStr += constraints().constraints() & QgsFieldConstraints::ConstraintUnique
121+
typeStr += ( constraints().constraints() & QgsFieldConstraints::ConstraintUnique )
122122
? QStringLiteral( " UNIQUE" )
123123
: QString();
124124
}

‎src/core/qgsfieldconstraints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void QgsFieldConstraints::setConstraint( QgsFieldConstraints::Constraint constra
6666

6767
QString QgsFieldConstraints::constraintExpression() const
6868
{
69-
return mConstraints & QgsFieldConstraints::ConstraintExpression ? mExpressionConstraint : QString();
69+
return ( mConstraints & QgsFieldConstraints::ConstraintExpression ) ? mExpressionConstraint : QString();
7070
}
7171

7272
void QgsFieldConstraints::setConstraintExpression( const QString &expression, const QString &description )

‎src/core/qgsspatialindex.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ QList<QgsFeatureId> QgsSpatialIndex::nearestNeighbor( const QgsPointXY &point, c
507507
Point p( pt, 2 );
508508

509509
QMutexLocker locker( &d->mMutex );
510-
QgsNearestNeighborComparator nnc( d->mFlags & QgsSpatialIndex::FlagStoreFeatureGeometries ? &d->mGeometries : nullptr,
510+
QgsNearestNeighborComparator nnc( ( d->mFlags & QgsSpatialIndex::FlagStoreFeatureGeometries ) ? &d->mGeometries : nullptr,
511511
point, maxDistance );
512512
d->mRTree->nearestNeighborQuery( neighbors, p, visitor, nnc );
513513

@@ -532,7 +532,7 @@ QList<QgsFeatureId> QgsSpatialIndex::nearestNeighbor( const QgsGeometry &geometr
532532
SpatialIndex::Region r = QgsSpatialIndexUtils::rectangleToRegion( geometry.boundingBox() );
533533

534534
QMutexLocker locker( &d->mMutex );
535-
QgsNearestNeighborComparator nnc( d->mFlags & QgsSpatialIndex::FlagStoreFeatureGeometries ? &d->mGeometries : nullptr,
535+
QgsNearestNeighborComparator nnc( ( d->mFlags & QgsSpatialIndex::FlagStoreFeatureGeometries ) ? &d->mGeometries : nullptr,
536536
geometry, maxDistance );
537537
d->mRTree->nearestNeighborQuery( neighbors, r, visitor, nnc );
538538

‎src/gui/processing/qgsprocessingtoolboxmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ QString QgsProcessingToolboxModel::toolTipForAlgorithm( const QgsProcessingAlgor
321321
algorithm->displayName(),
322322
!algorithm->shortDescription().isEmpty() ? QStringLiteral( "<p>%1</p>" ).arg( algorithm->shortDescription() ) : QString(),
323323
QObject::tr( "Algorithm ID: ‘%1’" ).arg( QStringLiteral( "<i>%1</i>" ).arg( algorithm->id() ) ),
324-
algorithm->flags() & QgsProcessingAlgorithm::FlagKnownIssues ? QStringLiteral( "<b style=\"color:red\">%1</b>" ).arg( QObject::tr( "Warning: Algorithm has known issues" ) ) : QString()
324+
( algorithm->flags() & QgsProcessingAlgorithm::FlagKnownIssues ) ? QStringLiteral( "<b style=\"color:red\">%1</b>" ).arg( QObject::tr( "Warning: Algorithm has known issues" ) ) : QString()
325325
);
326326
}
327327

‎src/gui/qgsfontbutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void QgsFontButton::wheelEvent( QWheelEvent *event )
376376
break;
377377
}
378378

379-
double increment = event->modifiers() & Qt::ControlModifier ? 0.1 : 1;
379+
double increment = ( event->modifiers() & Qt::ControlModifier ) ? 0.1 : 1;
380380
if ( event->delta() > 0 )
381381
{
382382
size += increment;

0 commit comments

Comments
 (0)
Please sign in to comment.