Skip to content

Commit b468ab3

Browse files
nyalldawsonnyalldawson
committedSep 11, 2017
Simplify boolean expressions
By applying clang-tidy readability-simplify-boolean-expr fixit
·
ltr-3_40final-3_0_0
1 parent 7afec4b commit b468ab3

34 files changed

+67
-210
lines changed
 

‎src/analysis/interpolation/DualEdgeTriangulation.cpp

Lines changed: 9 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,7 @@ bool DualEdgeTriangulation::calcNormal( double x, double y, Vector3D *result )
657657
{
658658
if ( result && mTriangleInterpolator )
659659
{
660-
if ( !mTriangleInterpolator->calcNormVec( x, y, result ) )
661-
{return false;}
662-
return true;
660+
return mTriangleInterpolator->calcNormVec( x, y, result );
663661
}
664662
else
665663
{
@@ -672,9 +670,7 @@ bool DualEdgeTriangulation::calcPoint( double x, double y, QgsPoint *result )
672670
{
673671
if ( result && mTriangleInterpolator )
674672
{
675-
if ( !mTriangleInterpolator->calcPoint( x, y, result ) )
676-
{return false;}
677-
return true;
673+
return mTriangleInterpolator->calcPoint( x, y, result );
678674
}
679675
else
680676
{
@@ -1737,14 +1733,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17371733
bool twoforcededges;//flag to decide, if edges should be added to the maps. Do not add them if true
17381734

17391735

1740-
if ( ( mHalfEdge[i]->getForced() || edgeOnConvexHull( i ) ) && ( mHalfEdge[mHalfEdge[i]->getNext()]->getForced() || edgeOnConvexHull( mHalfEdge[i]->getNext() ) ) )
1741-
{
1742-
twoforcededges = true;
1743-
}
1744-
else
1745-
{
1746-
twoforcededges = false;
1747-
}
1736+
twoforcededges = ( mHalfEdge[i]->getForced() || edgeOnConvexHull( i ) ) && ( mHalfEdge[mHalfEdge[i]->getNext()]->getForced() || edgeOnConvexHull( mHalfEdge[i]->getNext() ) );
17481737

17491738
if ( angle < mintol && !twoforcededges )
17501739
{
@@ -2063,32 +2052,11 @@ void DualEdgeTriangulation::ruppertRefinement()
20632052

20642053

20652054

2066-
if ( ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) )
2067-
{
2068-
twoforcededges1 = true;
2069-
}
2070-
else
2071-
{
2072-
twoforcededges1 = false;
2073-
}
2055+
twoforcededges1 = ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) );
20742056

2075-
if ( ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) )
2076-
{
2077-
twoforcededges2 = true;
2078-
}
2079-
else
2080-
{
2081-
twoforcededges2 = false;
2082-
}
2057+
twoforcededges2 = ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) );
20832058

2084-
if ( ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) )
2085-
{
2086-
twoforcededges3 = true;
2087-
}
2088-
else
2089-
{
2090-
twoforcededges3 = false;
2091-
}
2059+
twoforcededges3 = ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) );
20922060

20932061

20942062
//update the settings related to ed1
@@ -2276,32 +2244,11 @@ void DualEdgeTriangulation::ruppertRefinement()
22762244
//todo: put all three edges on the dontexamine list if two edges are forced or convex hull edges
22772245
bool twoforcededges1, twoforcededges2, twoforcededges3;
22782246

2279-
if ( ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) )
2280-
{
2281-
twoforcededges1 = true;
2282-
}
2283-
else
2284-
{
2285-
twoforcededges1 = false;
2286-
}
2247+
twoforcededges1 = ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) );
22872248

2288-
if ( ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) )
2289-
{
2290-
twoforcededges2 = true;
2291-
}
2292-
else
2293-
{
2294-
twoforcededges2 = false;
2295-
}
2249+
twoforcededges2 = ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) );
22962250

2297-
if ( ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) )
2298-
{
2299-
twoforcededges3 = true;
2300-
}
2301-
else
2302-
{
2303-
twoforcededges3 = false;
2304-
}
2251+
twoforcededges3 = ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) );
23052252

23062253

23072254
//update the settings related to ed1

‎src/analysis/raster/qgsrastermatrix.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,5 @@ bool QgsRasterMatrix::twoArgumentOperation( TwoArgOperator op, const QgsRasterMa
413413

414414
bool QgsRasterMatrix::testPowerValidity( double base, double power ) const
415415
{
416-
if ( ( base == 0 && power < 0 ) || ( base < 0 && ( power - std::floor( power ) ) > 0 ) )
417-
{
418-
return false;
419-
}
420-
return true;
416+
return !( ( base == 0 && power < 0 ) || ( base < 0 && ( power - std::floor( power ) ) > 0 ) );
421417
}

‎src/analysis/vector/qgsgeometrysnapper.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ bool QgsSnapIndex::SegmentSnapItem::getIntersection( const QgsPoint &p1, const Q
7979
return false;
8080

8181
double lambdaw = QgsVector( inter.x() - q1.x(), inter.y() - q1.y() ) * w;
82-
if ( lambdaw < 0. + 1E-8 || lambdaw >= wl - 1E-8 )
83-
return false;
84-
85-
return true;
82+
return !( lambdaw < 0. + 1E-8 || lambdaw >= wl - 1E-8 );
8683
}
8784

8885
bool QgsSnapIndex::SegmentSnapItem::getProjection( const QgsPoint &p, QgsPoint &pProj )

‎src/analysis/vector/qgszonalstatistics.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,11 +495,7 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( const QgsGeometry &p
495495

496496
bool QgsZonalStatistics::validPixel( float value ) const
497497
{
498-
if ( value == mInputNodataValue || std::isnan( value ) )
499-
{
500-
return false;
501-
}
502-
return true;
498+
return !( value == mInputNodataValue || std::isnan( value ) );
503499
}
504500

505501
QString QgsZonalStatistics::getUniqueFieldName( const QString &fieldName, const QList<QgsField> &newFields )

‎src/app/qgisappstylesheet.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()
7979
QgsDebugMsg( QString( "fontFamily: %1" ).arg( fontFamily ) );
8080
opts.insert( QStringLiteral( "fontFamily" ), QVariant( fontFamily ) );
8181

82-
bool gbxCustom = ( mMacStyle ? true : false );
82+
bool gbxCustom = ( mMacStyle );
8383
opts.insert( QStringLiteral( "groupBoxCustom" ), settings.value( QStringLiteral( "groupBoxCustom" ), QVariant( gbxCustom ) ) );
8484

8585
settings.endGroup(); // "qgis/stylesheet"
@@ -194,16 +194,16 @@ void QgisAppStyleSheet::setActiveValues()
194194
mStyle = qApp->style()->objectName(); // active style name (lowercase)
195195
QgsDebugMsg( QString( "Style name: %1" ).arg( mStyle ) );
196196

197-
mMotifStyle = mStyle.contains( QLatin1String( "motif" ) ) ? true : false; // motif
198-
mCdeStyle = mStyle.contains( QLatin1String( "cde" ) ) ? true : false; // cde
199-
mPlastqStyle = mStyle.contains( QLatin1String( "plastique" ) ) ? true : false; // plastique
200-
mCleanLkStyle = mStyle.contains( QLatin1String( "cleanlooks" ) ) ? true : false; // cleanlooks
201-
mGtkStyle = mStyle.contains( QLatin1String( "gtk" ) ) ? true : false; // gtk+
202-
mWinStyle = mStyle.contains( QLatin1String( "windows" ) ) ? true : false; // windows
203-
mWinXpStyle = mStyle.contains( QLatin1String( "windowsxp" ) ) ? true : false; // windowsxp
204-
mWinVistaStyle = mStyle.contains( QLatin1String( "windowsvista" ) ) ? true : false; // windowsvista
205-
mMacStyle = mStyle.contains( QLatin1String( "macintosh" ) ) ? true : false; // macintosh (aqua)
206-
mOxyStyle = mStyle.contains( QLatin1String( "oxygen" ) ) ? true : false; // oxygen
197+
mMotifStyle = mStyle.contains( QLatin1String( "motif" ) ); // motif
198+
mCdeStyle = mStyle.contains( QLatin1String( "cde" ) ); // cde
199+
mPlastqStyle = mStyle.contains( QLatin1String( "plastique" ) ); // plastique
200+
mCleanLkStyle = mStyle.contains( QLatin1String( "cleanlooks" ) ); // cleanlooks
201+
mGtkStyle = mStyle.contains( QLatin1String( "gtk" ) ); // gtk+
202+
mWinStyle = mStyle.contains( QLatin1String( "windows" ) ); // windows
203+
mWinXpStyle = mStyle.contains( QLatin1String( "windowsxp" ) ); // windowsxp
204+
mWinVistaStyle = mStyle.contains( QLatin1String( "windowsvista" ) ); // windowsvista
205+
mMacStyle = mStyle.contains( QLatin1String( "macintosh" ) ); // macintosh (aqua)
206+
mOxyStyle = mStyle.contains( QLatin1String( "oxygen" ) ); // oxygen
207207

208208
mDefaultFont = qApp->font(); // save before it is changed in any way
209209

‎src/app/qgscustomization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ bool QgsCustomizationDialog::itemChecked( const QString &path )
121121
QTreeWidgetItem *myItem = item( path );
122122
if ( !myItem )
123123
return true;
124-
return myItem->checkState( 0 ) == Qt::Checked ? true : false;
124+
return myItem->checkState( 0 ) == Qt::Checked;
125125
}
126126

127127
void QgsCustomizationDialog::setItemChecked( const QString &path, bool on )
@@ -159,7 +159,7 @@ void QgsCustomizationDialog::itemToSettings( const QString &path, QTreeWidgetIte
159159
return; // object is not identifiable
160160

161161
QString myPath = path + '/' + objectName;
162-
bool on = item->checkState( 0 ) == Qt::Checked ? true : false;
162+
bool on = item->checkState( 0 ) == Qt::Checked;
163163
settings->setValue( myPath, on );
164164

165165
for ( int i = 0; i < item->childCount(); ++i )

‎src/app/qgsdecorationgrid.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -753,11 +753,9 @@ bool QgsDecorationGrid::isDirty()
753753
{
754754
// checks if stored map units is undefined or different from canvas map units
755755
// or if interval is 0
756-
if ( mMapUnits == QgsUnitTypes::DistanceUnknownUnit ||
757-
mMapUnits != QgisApp::instance()->mapCanvas()->mapSettings().mapUnits() ||
758-
qgsDoubleNear( mGridIntervalX, 0.0 ) || qgsDoubleNear( mGridIntervalY, 0.0 ) )
759-
return true;
760-
return false;
756+
return mMapUnits == QgsUnitTypes::DistanceUnknownUnit ||
757+
mMapUnits != QgisApp::instance()->mapCanvas()->mapSettings().mapUnits() ||
758+
qgsDoubleNear( mGridIntervalX, 0.0 ) || qgsDoubleNear( mGridIntervalY, 0.0 );
761759
}
762760

763761
void QgsDecorationGrid::setDirty( bool dirty )

‎src/app/qgsmaptoolpinlabels.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,5 @@ bool QgsMapToolPinLabels::pinUnpinCurrentDiagram( bool pin )
473473
vlayer->endEditCommand();
474474
}
475475

476-
if ( writeFailed )
477-
return false;
478-
479-
return true;
476+
return !writeFailed;
480477
}

‎src/app/qgsmaptoolrotatelabel.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void QgsMapToolRotateLabel::canvasPressEvent( QgsMapMouseEvent *e )
7171
return;
7272
}
7373

74-
if ( true )
7574
{
7675
mCurrentMouseAzimuth = convertAzimuth( mRotationPoint.azimuth( toMapCoordinates( e->pos() ) ) );
7776

‎src/app/qgsmaptoolshowhidelabels.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent *e )
157157
if ( labChanged || diagChanged )
158158
{
159159
// TODO: highlight features (maybe with QTimer?)
160-
labelChanged = labelChanged || true;
160+
labelChanged = true;
161161
}
162162
}
163163
}
@@ -173,7 +173,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent *e )
173173
mCurrentLabel.pos = pos;
174174

175175
if ( showHide( vlayer, false ) )
176-
labelChanged = labelChanged || true;
176+
labelChanged = true;
177177
}
178178
}
179179
}

‎src/core/composer/qgscomposition.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -955,16 +955,16 @@ bool QgsComposition::readXml( const QDomElement &compositionElem, const QDomDocu
955955
}
956956

957957
//snapping
958-
mSnapToGrid = compositionElem.attribute( QStringLiteral( "snapping" ), QStringLiteral( "0" ) ).toInt() == 0 ? false : true;
959-
mGridVisible = compositionElem.attribute( QStringLiteral( "gridVisible" ), QStringLiteral( "0" ) ).toInt() == 0 ? false : true;
958+
mSnapToGrid = compositionElem.attribute( QStringLiteral( "snapping" ), QStringLiteral( "0" ) ).toInt() != 0;
959+
mGridVisible = compositionElem.attribute( QStringLiteral( "gridVisible" ), QStringLiteral( "0" ) ).toInt() != 0;
960960

961961
mSnapGridResolution = compositionElem.attribute( QStringLiteral( "snapGridResolution" ) ).toDouble();
962962
mSnapGridOffsetX = compositionElem.attribute( QStringLiteral( "snapGridOffsetX" ) ).toDouble();
963963
mSnapGridOffsetY = compositionElem.attribute( QStringLiteral( "snapGridOffsetY" ) ).toDouble();
964964

965-
mAlignmentSnap = compositionElem.attribute( QStringLiteral( "alignmentSnap" ), QStringLiteral( "1" ) ).toInt() == 0 ? false : true;
966-
mGuidesVisible = compositionElem.attribute( QStringLiteral( "guidesVisible" ), QStringLiteral( "1" ) ).toInt() == 0 ? false : true;
967-
mSmartGuides = compositionElem.attribute( QStringLiteral( "smartGuides" ), QStringLiteral( "1" ) ).toInt() == 0 ? false : true;
965+
mAlignmentSnap = compositionElem.attribute( QStringLiteral( "alignmentSnap" ), QStringLiteral( "1" ) ).toInt() != 0;
966+
mGuidesVisible = compositionElem.attribute( QStringLiteral( "guidesVisible" ), QStringLiteral( "1" ) ).toInt() != 0;
967+
mSmartGuides = compositionElem.attribute( QStringLiteral( "smartGuides" ), QStringLiteral( "1" ) ).toInt() != 0;
968968
mSnapTolerance = compositionElem.attribute( QStringLiteral( "snapTolerancePixels" ), QStringLiteral( "10" ) ).toInt();
969969

970970
mResizeToContentsMarginTop = compositionElem.attribute( QStringLiteral( "resizeToContentsMarginTop" ), QStringLiteral( "0" ) ).toDouble();

‎src/core/expression/qgsexpressionnodeimpl.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,10 +1347,7 @@ bool QgsExpressionNodeCondition::needsGeometry() const
13471347
return true;
13481348
}
13491349

1350-
if ( mElseExp && mElseExp->needsGeometry() )
1351-
return true;
1352-
1353-
return false;
1350+
return mElseExp && mElseExp->needsGeometry();
13541351
}
13551352

13561353
QgsExpressionNode *QgsExpressionNodeCondition::clone() const

‎src/core/geometry/qgsbox3d.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ bool QgsBox3d::intersects( const QgsBox3d &other ) const
9292

9393
double z1 = ( mZmin > other.mZmin ? mZmin : other.mZmin );
9494
double z2 = ( mZmax < other.mZmax ? mZmax : other.mZmax );
95-
if ( z1 > z2 )
96-
return false;
97-
98-
return true;
95+
return z1 <= z2;
9996
}
10097

10198
bool QgsBox3d::contains( const QgsBox3d &other ) const

‎src/core/geometry/qgsgeometryutils.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,7 @@ bool QgsGeometryUtils::segmentIntersection( const QgsPoint &p1, const QgsPoint &
360360
return false;
361361

362362
double lambdaw = QgsVector( inter.x() - q1.x(), inter.y() - q1.y() ) * w;
363-
if ( lambdaw < 0. + tolerance || lambdaw >= wl - tolerance )
364-
return false;
365-
366-
return true;
363+
return !( lambdaw < 0. + tolerance || lambdaw >= wl - tolerance );
367364
}
368365

369366
QList<QgsGeometryUtils::SelfIntersection> QgsGeometryUtils::getSelfIntersections( const QgsAbstractGeometry *geom, int part, int ring, double tolerance )

‎src/core/geometry/qgsrectangle.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ bool QgsRectangle::intersects( const QgsRectangle &rect ) const
173173
return false;
174174
double y1 = ( mYmin > rect.mYmin ? mYmin : rect.mYmin );
175175
double y2 = ( mYmax < rect.mYmax ? mYmax : rect.mYmax );
176-
if ( y1 > y2 )
177-
return false;
178-
return true;
176+
return y1 <= y2;
179177
}
180178

181179
bool QgsRectangle::contains( const QgsRectangle &rect ) const

‎src/core/geometry/qgstriangle.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,7 @@ double QgsTriangle::inscribedRadius() const
541541

542542
bool QgsTriangle::validateGeom( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &p3 )
543543
{
544-
if ( ( ( p1 == p2 ) || ( p1 == p3 ) || ( p2 == p3 ) ) || qgsDoubleNear( QgsGeometryUtils::leftOfLine( p1.x(), p1.y(), p2.x(), p2.y(), p3.x(), p3.y() ), 0.0 ) )
545-
{
546-
return false;
547-
}
548-
549-
return true;
544+
return !( ( ( p1 == p2 ) || ( p1 == p3 ) || ( p2 == p3 ) ) || qgsDoubleNear( QgsGeometryUtils::leftOfLine( p1.x(), p1.y(), p2.x(), p2.y(), p3.x(), p3.y() ), 0.0 ) );
550545
}
551546

552547
QgsCircle QgsTriangle::inscribedCircle() const

‎src/core/pal/feature.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,7 @@ bool FeaturePart::hasSameLabelFeatureAs( FeaturePart *part ) const
166166

167167
// any part of joined features are also treated as having the same label feature
168168
int connectedFeatureId = mLF->layer()->connectedFeatureId( mLF->id() );
169-
if ( connectedFeatureId >= 0 && connectedFeatureId == mLF->layer()->connectedFeatureId( part->featureId() ) )
170-
return true;
171-
172-
return false;
169+
return connectedFeatureId >= 0 && connectedFeatureId == mLF->layer()->connectedFeatureId( part->featureId() );
173170
}
174171

175172
LabelPosition::Quadrant FeaturePart::quadrantFromOffset() const

‎src/core/processing/qgsprocessingparameters.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,10 +1158,7 @@ bool QgsProcessingParameterExtent::checkValueIsAcceptable( const QVariant &input
11581158
}
11591159

11601160
// try as layer extent
1161-
if ( QgsProcessingUtils::mapLayerFromString( input.toString(), *context ) )
1162-
return true;
1163-
1164-
return false;
1161+
return QgsProcessingUtils::mapLayerFromString( input.toString(), *context );
11651162
}
11661163

11671164
QString QgsProcessingParameterExtent::valueAsPythonString( const QVariant &value, QgsProcessingContext &context ) const
@@ -1649,10 +1646,7 @@ bool QgsProcessingParameterNumber::checkValueIsAcceptable( const QVariant &input
16491646
if ( !ok )
16501647
return mFlags & FlagOptional;
16511648

1652-
if ( res < mMin || res > mMax )
1653-
return false;
1654-
1655-
return true;
1649+
return !( res < mMin || res > mMax );
16561650
}
16571651

16581652
QString QgsProcessingParameterNumber::valueAsPythonString( const QVariant &value, QgsProcessingContext & ) const

‎src/core/qgsmaptopixelgeometrysimplifier.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ bool QgsMapToPixelSimplifier::equalSnapToGrid( double x1, double y1, double x2,
5353

5454
int grid_y1 = std::round( ( y1 - gridOriginY ) * gridInverseSizeXY );
5555
int grid_y2 = std::round( ( y2 - gridOriginY ) * gridInverseSizeXY );
56-
if ( grid_y1 != grid_y2 ) return false;
57-
58-
return true;
56+
return grid_y1 == grid_y2;
5957
}
6058

6159
//////////////////////////////////////////////////////////////////////////////////////////////

‎src/core/qgssnappingutils.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ bool QgsSnappingUtils::isIndexPrepared( QgsVectorLayer *vl, const QgsRectangle &
9292

9393
QgsRectangle aoi( areaOfInterest );
9494
aoi.scale( 0.999 );
95-
if ( ( mStrategy == IndexHybrid || mStrategy == IndexExtent ) && loc->hasIndex() && ( !loc->extent() || loc->extent()->contains( aoi ) ) )
96-
return true;
97-
98-
return false; // the index - even if it exists - is not suitable
95+
return ( mStrategy == IndexHybrid || mStrategy == IndexExtent ) && loc->hasIndex() && ( !loc->extent() || loc->extent()->contains( aoi ) ); // the index - even if it exists - is not suitable
9996
}
10097

10198

0 commit comments

Comments
 (0)
Please sign in to comment.