Changing NULL to nullptr and renaming Geos->Intersect to Geos->Intersects and Geos->SymmetricDifference to Geos->SymDifference

Author: pmeems

src/COM classes/Shape.cpp

@@ -1190,7 +1190,7 @@ STDMETHODIMP CShape::Relates(IShape* Shape, tkSpatialRelation Relation, VARIANT_
 		case srCrosses:		res = oGeom1->Crosses(oGeom2); break;
 		case srDisjoint:	res = oGeom1->Disjoint(oGeom2); break;
 		case srEquals:		res = oGeom1->Equals(oGeom2); break;
-		case srIntersects:	res = oGeom1->Intersect(oGeom2); break;
+		case srIntersects:	res = oGeom1->Intersects(oGeom2); break;
 		case srOverlaps:	res = oGeom1->Overlaps(oGeom2); break;
 		case srTouches:		res = oGeom1->Touches(oGeom2); break;
 		case srWithin:		res = oGeom1->Within(oGeom2); break;
@@ -1261,9 +1261,9 @@ STDMETHODIMP CShape::Within(IShape* Shape, VARIANT_BOOL* retval)
 STDMETHODIMP CShape::Clip(IShape* Shape, tkClipOperation Operation, IShape** retval)
 {
 	AFX_MANAGE_STATE(AfxGetStaticModuleState());
-	*retval = NULL;
+	*retval = nullptr;
 
-	if( Shape == NULL)
+	if( Shape == nullptr)
 	{	
 		ErrorMessage(tkUNEXPECTED_NULL_PARAMETER);
 		return S_OK;
@@ -1275,23 +1275,23 @@ STDMETHODIMP CShape::Clip(IShape* Shape, tkClipOperation Operation, IShape** ret
 			return S_OK;
 	}
 
-	OGRGeometry* oGeom1 = NULL;
-	OGRGeometry* oGeom2 = NULL;
+	OGRGeometry* oGeom1 = nullptr;
+	OGRGeometry* oGeom2 = nullptr;
 
 	oGeom1 = OgrConverter::ShapeToGeometry(this);
-	if (oGeom1 == NULL) 
+	if (oGeom1 == nullptr) 
 		return S_OK;
 
 	OGRwkbGeometryType oReturnType = oGeom1->getGeometryType();
 
 	oGeom2 = OgrConverter::ShapeToGeometry(Shape);
-	if (oGeom2 == NULL) 
+	if (oGeom2 == nullptr) 
 	{	
 		OGRGeometryFactory::destroyGeometry(oGeom1);
 		return S_OK;
 	}
 
-	OGRGeometry* oGeom3 = NULL;
+	OGRGeometry* oGeom3 = nullptr;
 
 	switch (Operation)
 	{
@@ -1306,7 +1306,7 @@ STDMETHODIMP CShape::Clip(IShape* Shape, tkClipOperation Operation, IShape** ret
 			oGeom3 = oGeom1->Intersection(oGeom2);
 			break;
 		case clSymDifference:
-			oGeom3 = oGeom1->SymmetricDifference(oGeom2);
+			oGeom3 = oGeom1->SymDifference(oGeom2);
 			break;
 		default:
 			break;

src/COM classes/Utils.cpp

@@ -3339,7 +3339,7 @@ STDMETHODIMP CUtils::ClipPolygon(PolygonOperation op, IShape* SubjectPolygon, IS
             oGeom = geomSubject->Intersection(geomClip);
             break;
         case EXCLUSIVEOR_OPERATION:
-            oGeom = geomSubject->SymmetricDifference(geomClip);
+            oGeom = geomSubject->SymDifference(geomClip);
             break;
         case UNION_OPERATION:
             oGeom = geomSubject->Union(geomClip);