Skip to content

Commit 0d1a981

Browse files
committed
Add qFloor, qCeil, qSqrt to banned keywords
1 parent 5bc848c commit 0d1a981

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void QgsGeometryAngleCheck::collectErrors( QList<QgsGeometryCheckError *> &error
5252
continue;
5353
}
5454

55-
double angle = qAcos( v21 * v23 ) / M_PI * 180.0;
55+
double angle = std::acos( v21 * v23 ) / M_PI * 180.0;
5656
if ( angle < mMinAngle )
5757
{
5858
errors.append( new QgsGeometryCheckError( this, layerFeature, p2, QgsVertexId( iPart, iRing, iVert ), angle ) );

src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void QgsGeometrySegmentLengthCheck::collectErrors( QList<QgsGeometryCheckError *
4141
{
4242
QgsPoint pi = geom->vertexAt( QgsVertexId( iPart, iRing, iVert ) );
4343
QgsPoint pj = geom->vertexAt( QgsVertexId( iPart, iRing, jVert ) );
44-
double dist = qSqrt( QgsGeometryUtils::sqrDistance2D( pi, pj ) );
44+
double dist = pi.distance( pj );
4545
// Don't report very small lengths, they are either duplicate nodes or degenerate geometries
4646
if ( dist < minLength && dist > mContext->tolerance )
4747
{
@@ -85,7 +85,7 @@ void QgsGeometrySegmentLengthCheck::fixError( QgsGeometryCheckError *error, int
8585

8686
QgsPoint pi = geom->vertexAt( error->vidx() );
8787
QgsPoint pj = geom->vertexAt( QgsVertexId( vidx.part, vidx.ring, ( vidx.vertex - 1 + nVerts ) % nVerts ) );
88-
double dist = qSqrt( QgsGeometryUtils::sqrDistance2D( pi, pj ) );
88+
double dist = pi.distance( pj );
8989
double layerToMapUnits = featurePool->getLayerToMapUnits();
9090
double minLength = mMinLengthMapUnits / layerToMapUnits;
9191
if ( dist >= minLength )

tests/code_layout/test_banned_keywords.sh

+9
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ HINTS[27]="Use std::shared_ptr instead"
107107
KEYWORDS[28]="QOverload"
108108
HINTS[28]="Use qgis::overload instead"
109109

110+
KEYWORDS[29]="qFloor"
111+
HINTS[29]="Use std::floor instead"
112+
113+
KEYWORDS[30]="qCeil"
114+
HINTS[30]="Use std::ceil instead"
115+
116+
KEYWORDS[31]="qSqrt"
117+
HINTS[31]="Use std::sqrt instead"
118+
110119
RES=
111120
DIR=$(git rev-parse --show-toplevel)
112121

0 commit comments

Comments
 (0)