Rename QgsGeometryData to QgsGeometryPrivate. Update class comment

mhugent · mhugent · commit 06b472550d86 · 2015-06-09T11:52:29.000+02:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -50,13 +50,13 @@ email                : morb at ozemail dot com dot au
 #include <winsock.h>
 #endif
 
-struct QgsGeometryData
+struct QgsGeometryPrivate
 {
   QAtomicInt ref;
   QgsAbstractGeometryV2* geometry;
 };
 
-QgsGeometry::QgsGeometry(): d( new QgsGeometryData() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )
+QgsGeometry::QgsGeometry(): d( new QgsGeometryPrivate() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )
 {
   d->geometry = 0;
   d->ref = QAtomicInt( 1 );
@@ -75,7 +75,7 @@ QgsGeometry::~QgsGeometry()
   removeWkbGeos();
 }
 
-QgsGeometry::QgsGeometry( QgsAbstractGeometryV2* geom ): d( new QgsGeometryData() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )
+QgsGeometry::QgsGeometry( QgsAbstractGeometryV2* geom ): d( new QgsGeometryPrivate() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )
 {
   d->geometry = geom;
   d->ref = QAtomicInt( 1 );
@@ -119,7 +119,7 @@ void QgsGeometry::detach( bool cloneGeom )
     {
       cGeom = d->geometry->clone();
     }
-    d = new QgsGeometryData();
+    d = new QgsGeometryPrivate();
     d->geometry = cGeom;
     d->ref = QAtomicInt( 1 );
   }
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -59,23 +59,12 @@ typedef QVector<QgsPolygon> QgsMultiPolygon;
 
 class QgsRectangle;
 
-/** \ingroup core
- * A geometry is the spatial representation of a feature.
- * Represents a geometry with input and output in formats specified by
- * (at least) the Open Geospatial Consortium (WKB / Wkt), and containing
- * various functions for geoprocessing of the geometry.
- *
- * The geometry is represented internally by the OGC WKB format or
- * as GEOS geometry. Some functions use WKB for their work, others
- * use GEOS.
- *
- * TODO: migrate completely to GEOS and only support WKB/Wkt import/export.
- *
- * @author Brendan Morley
- */
 class QgsConstWkbPtr;
 
-struct QgsGeometryData;
+struct QgsGeometryPrivate;
+
+/** \ingroup core
+- * A geometry is the spatial representation of a feature. This class is deprecated. Please use QgsAbstractGeometryV2 directly for new code*/
 
 class CORE_EXPORT QgsGeometry
 {
@@ -715,7 +704,7 @@ class CORE_EXPORT QgsGeometry
 
   private:
 
-    QgsGeometryData* d; //implicitely shared data pointer
+    QgsGeometryPrivate* d; //implicitely shared data pointer
     mutable const unsigned char* mWkb; //store wkb pointer for backward compatibility
     mutable int mWkbSize;
     mutable GEOSGeometry* mGeos;

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ email : morb at ozemail dot com dot au`
`50`	`50`	`#include <winsock.h>`
`51`	`51`	`#endif`
`52`	`52`
`53`		`-struct QgsGeometryData`
	`53`	`+struct QgsGeometryPrivate`
`54`	`54`	`{`
`55`	`55`	`QAtomicInt ref;`
`56`	`56`	`QgsAbstractGeometryV2* geometry;`
`57`	`57`	`};`
`58`	`58`
`59`		`-QgsGeometry::QgsGeometry(): d( new QgsGeometryData() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )`
	`59`	`+QgsGeometry::QgsGeometry(): d( new QgsGeometryPrivate() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )`
`60`	`60`	`{`
`61`	`61`	`d->geometry = 0;`
`62`	`62`	`d->ref = QAtomicInt( 1 );`
`@@ -75,7 +75,7 @@ QgsGeometry::~QgsGeometry()`
`75`	`75`	`removeWkbGeos();`
`76`	`76`	`}`
`77`	`77`
`78`		`-QgsGeometry::QgsGeometry( QgsAbstractGeometryV2* geom ): d( new QgsGeometryData() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )`
	`78`	`+QgsGeometry::QgsGeometry( QgsAbstractGeometryV2* geom ): d( new QgsGeometryPrivate() ), mWkb( 0 ), mWkbSize( 0 ), mGeos( 0 )`
`79`	`79`	`{`
`80`	`80`	`d->geometry = geom;`
`81`	`81`	`d->ref = QAtomicInt( 1 );`
`@@ -119,7 +119,7 @@ void QgsGeometry::detach( bool cloneGeom )`
`119`	`119`	`{`
`120`	`120`	`cGeom = d->geometry->clone();`
`121`	`121`	`}`
`122`		`- d = new QgsGeometryData();`
	`122`	`+ d = new QgsGeometryPrivate();`
`123`	`123`	`d->geometry = cGeom;`
`124`	`124`	`d->ref = QAtomicInt( 1 );`
`125`	`125`	`}`