Skip to content

Commit 639d064

Browse files
committedAug 12, 2017
NULL to nullptr
1 parent a6800d6 commit 639d064

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed
 

‎python/core/geometry/qgsabstractgeometry.sip

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,31 @@ class QgsAbstractGeometry
2626
%End
2727

2828
%ConvertToSubClassCode
29-
if ( dynamic_cast<QgsPoint *>( sipCpp ) != NULL )
29+
if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
3030
sipType = sipType_QgsPoint;
31-
else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != NULL )
31+
else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != nullptr )
3232
sipType = sipType_QgsLineString;
33-
else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != NULL )
33+
else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != nullptr )
3434
sipType = sipType_QgsCircularString;
35-
else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
35+
else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != nullptr )
3636
sipType = sipType_QgsCompoundCurve;
37-
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != NULL )
37+
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
3838
sipType = sipType_QgsTriangle;
39-
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
39+
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
4040
sipType = sipType_QgsPolygonV2;
41-
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
41+
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
4242
sipType = sipType_QgsCurvePolygon;
43-
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
43+
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
4444
sipType = sipType_QgsMultiPointV2;
45-
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != NULL )
45+
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != nullptr )
4646
sipType = sipType_QgsMultiLineString;
47-
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
47+
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != nullptr )
4848
sipType = sipType_QgsMultiPolygonV2;
49-
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != NULL )
49+
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != nullptr )
5050
sipType = sipType_QgsMultiSurface;
51-
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != NULL )
51+
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != nullptr )
5252
sipType = sipType_QgsMultiCurve;
53-
else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
53+
else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != nullptr )
5454
sipType = sipType_QgsGeometryCollection;
5555
else
5656
sipType = 0;

‎src/core/geometry/qgsabstractgeometry.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,31 @@ class CORE_EXPORT QgsAbstractGeometry
5353

5454
#ifdef SIP_RUN
5555
SIP_CONVERT_TO_SUBCLASS_CODE
56-
if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != NULL )
56+
if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
5757
sipType = sipType_QgsPoint;
58-
else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != NULL )
58+
else if ( qgsgeometry_cast<QgsLineString *>( sipCpp ) != nullptr )
5959
sipType = sipType_QgsLineString;
60-
else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != NULL )
60+
else if ( qgsgeometry_cast<QgsCircularString *>( sipCpp ) != nullptr )
6161
sipType = sipType_QgsCircularString;
62-
else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != NULL )
62+
else if ( qgsgeometry_cast<QgsCompoundCurve *>( sipCpp ) != nullptr )
6363
sipType = sipType_QgsCompoundCurve;
64-
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != NULL )
64+
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
6565
sipType = sipType_QgsTriangle;
66-
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != NULL )
66+
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
6767
sipType = sipType_QgsPolygonV2;
68-
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != NULL )
68+
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
6969
sipType = sipType_QgsCurvePolygon;
70-
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != NULL )
70+
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
7171
sipType = sipType_QgsMultiPointV2;
72-
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != NULL )
72+
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != nullptr )
7373
sipType = sipType_QgsMultiLineString;
74-
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != NULL )
74+
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != nullptr )
7575
sipType = sipType_QgsMultiPolygonV2;
76-
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != NULL )
76+
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != nullptr )
7777
sipType = sipType_QgsMultiSurface;
78-
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != NULL )
78+
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != nullptr )
7979
sipType = sipType_QgsMultiCurve;
80-
else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != NULL )
80+
else if ( qgsgeometry_cast<QgsGeometryCollection *>( sipCpp ) != nullptr )
8181
sipType = sipType_QgsGeometryCollection;
8282
else
8383
sipType = 0;

0 commit comments

Comments
 (0)
Please sign in to comment.