Derive MultiLineString from MultiCurve and MultiPolygon from MultiSur…

…face
qgis · Jun 23, 2015 · 0bbc11b · 0bbc11b
1 parent d0a624d
commit 0bbc11b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/python/core/geometry/qgsmultilinestringv2.sip b/python/core/geometry/qgsmultilinestringv2.sip
@@ -1,4 +1,4 @@
-class QgsMultiLineStringV2: public QgsGeometryCollectionV2
+class QgsMultiLineStringV2: public QgsMultiCurveV2
 {
 %TypeHeaderCode
 #include <qgsmultilinestringv2.h>

diff --git a/python/core/geometry/qgsmultipolygonv2.sip b/python/core/geometry/qgsmultipolygonv2.sip
@@ -1,4 +1,4 @@
-class QgsMultiPolygonV2: public QgsGeometryCollectionV2
+class QgsMultiPolygonV2: public QgsMultiSurfaceV2
 {
 %TypeHeaderCode
 #include <qgsmultipolygonv2.h>

diff --git a/src/core/geometry/qgsmultilinestringv2.h b/src/core/geometry/qgsmultilinestringv2.h
@@ -16,9 +16,9 @@ email                : marco.hugentobler at sourcepole dot com
 #ifndef QGSMULTILINESTRINGV2_H
 #define QGSMULTILINESTRINGV2_H
 
-#include "qgsgeometrycollectionv2.h"
+#include "qgsmulticurvev2.h"
 
-class CORE_EXPORT QgsMultiLineStringV2: public QgsGeometryCollectionV2
+class CORE_EXPORT QgsMultiLineStringV2: public QgsMultiCurveV2
 {
   public:
     virtual QString geometryType() const override { return "MultiLineString"; }

diff --git a/src/core/geometry/qgsmultipolygonv2.h b/src/core/geometry/qgsmultipolygonv2.h
@@ -16,9 +16,9 @@ email                : marco.hugentobler at sourcepole dot com
 #ifndef QGSMULTIPOLYGONV2_H
 #define QGSMULTIPOLYGONV2_H
 
-#include "qgsgeometrycollectionv2.h"
+#include "qgsmultisurfacev2.h"
 
-class CORE_EXPORT QgsMultiPolygonV2: public QgsGeometryCollectionV2
+class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurfaceV2
 {
   public:
     virtual QString geometryType() const override { return "MultiPolygon"; }