Make QgsLineStringV2::fromWkbPoints private

qgis · Nov 27, 2015 · 7eb1133 · 7eb1133
1 parent 1f33011
commit 7eb1133
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/python/core/geometry/qgslinestringv2.sip b/python/core/geometry/qgslinestringv2.sip
@@ -14,13 +14,6 @@ class QgsLineStringV2: public QgsCurveV2
     QgsLineStringV2();
     ~QgsLineStringV2();
 
-    /** Resets the line string to match the line string in a WKB geometry.
-     * @param type WKB type
-     * @param wkb WKB representation of line geometry
-     * @note not available in Python bindings
-     */
-    //void fromWkbPoints( QgsWKBTypes::Type type, const QgsConstWkbPtr& wkb );
-
     /** Returns the specified point from inside the line string.
      * @param i index of point, starting at 0 for the first point
      */

diff --git a/src/core/geometry/qgslinestringv2.h b/src/core/geometry/qgslinestringv2.h
@@ -33,13 +33,6 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
     QgsLineStringV2();
     ~QgsLineStringV2();
 
-    /** Resets the line string to match the line string in a WKB geometry.
-     * @param type WKB type
-     * @param wkb WKB representation of line geometry
-     * @note not available in Python bindings
-     */
-    void fromWkbPoints( QgsWKBTypes::Type type, const QgsConstWkbPtr& wkb );
-
     /** Returns the specified point from inside the line string.
      * @param i index of point, starting at 0 for the first point
      */
@@ -188,6 +181,15 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
     QVector<double> mM;
 
     void importVerticesFromWkb( const QgsConstWkbPtr& wkb );
+
+    /** Resets the line string to match the line string in a WKB geometry.
+     * @param type WKB type
+     * @param wkb WKB representation of line geometry
+     */
+    void fromWkbPoints( QgsWKBTypes::Type type, const QgsConstWkbPtr& wkb );
+
+    friend class QgsPolygonV2;
+
 };
 
 #endif // QGSLINESTRINGV2_H
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -1220,8 +1220,6 @@ void TestQgsGeometry::lineStringV2()
   wkb = 0;
   QCOMPARE( l16.wkbType(), QgsWKBTypes::Unknown );
 
-  //TODO - from WKB points
-
   //to/from WKT
   QgsLineStringV2 l17;
   l17.setPoints( QList< QgsPointV2 >() << QgsPointV2( QgsWKBTypes::PointZM, 1, 2, 3, 4 )