[QGIS Commit] r9713 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-11-27 09:15:27 -0500 (Thu, 27 Nov 2008)
New Revision: 9713

Modified:
   trunk/qgis/src/core/qgsgeometry.cpp
   trunk/qgis/src/core/qgsgeometry.h
Log:
Function name without get, changed more function calls to use numberOfGeometries()

Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp	2008-11-27 14:05:12 UTC (rev 9712)
+++ trunk/qgis/src/core/qgsgeometry.cpp	2008-11-27 14:15:27 UTC (rev 9713)
@@ -4832,7 +4832,7 @@
   GEOSGeometry *cutEdges = GEOSPolygonizer_getCutEdges( &nodedGeometry, 1 );
   if ( cutEdges )
   {
-    if ( GEOSGetNumGeometries( cutEdges ) > 0 )
+    if ( numberOfGeometries( cutEdges ) > 0 )
     {
       GEOSGeom_destroy( cutEdges );
       GEOSGeom_destroy( nodedGeometry );
@@ -4844,7 +4844,7 @@
 #endif
 
   GEOSGeometry *polygons = GEOSPolygonize( &nodedGeometry, 1 );
-  if ( !polygons || GEOSGetNumGeometries( polygons ) == 0 )
+  if ( !polygons || numberOfGeometries( polygons ) == 0 )
   {
     if ( polygons )
       GEOSGeom_destroy( polygons );
@@ -4864,7 +4864,7 @@
   //ratio intersect geometry / geometry. This should be close to 1
   //if the polygon belongs to the input geometry
 
-  for ( int i = 0; i < getNumberOfGeometries( polygons ); i++ )
+  for ( int i = 0; i < numberOfGeometries( polygons ); i++ )
   {
     const GEOSGeometry *polygon = GEOSGetGeometryN( polygons, i );
     intersectGeometry = GEOSIntersection( mGeos, polygon );
@@ -4883,7 +4883,7 @@
   }
 
   bool splitDone = true;
-  int nGeometriesThis = getNumberOfGeometries( mGeos ); //original number of geometries
+  int nGeometriesThis = numberOfGeometries( mGeos ); //original number of geometries
   if ( testedGeometries.size() == nGeometriesThis )
   {
     splitDone = false;
@@ -5003,7 +5003,7 @@
   return unionGeometry;
 }
 
-int QgsGeometry::getNumberOfGeometries(GEOSGeometry* g) const
+int QgsGeometry::numberOfGeometries(GEOSGeometry* g) const
 {
   if(!g)
   {

Modified: trunk/qgis/src/core/qgsgeometry.h
===================================================================
--- trunk/qgis/src/core/qgsgeometry.h	2008-11-27 14:05:12 UTC (rev 9712)
+++ trunk/qgis/src/core/qgsgeometry.h	2008-11-27 14:15:27 UTC (rev 9713)
@@ -418,7 +418,7 @@
     GEOSGeometry* nodeGeometries( const GEOSGeometry *splitLine, GEOSGeometry *poly ) const;
 
     /**Returns number of single geometry in a geos geometry. Is save for geos 2 and 3*/
-    int getNumberOfGeometries(GEOSGeometry* g) const;
+    int numberOfGeometries(GEOSGeometry* g) const;
 
     int mergeGeometriesMultiTypeSplit( QVector<GEOSGeometry*>& splitResult );