Fix sip bindings for QgsPoint

qgis · Jun 14, 2017 · 4db671e · 4db671e
1 parent 7e48719
commit 4db671e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/python/core/geometry/qgspoint.sip b/python/core/geometry/qgspoint.sip
@@ -23,11 +23,11 @@ class QgsPoint: QgsAbstractGeometry
   public:
 
     QgsPoint( double x = 0.0, double y = 0.0, SIP_PYOBJECT z = Py_None, SIP_PYOBJECT m = Py_None ) [( double x = 0.0, double y = 0.0, double z = 0.0, double m = 0.0 )];
-    % Docstring
-    Construct a point with the provided initial coordinate values.
+%Docstring
+ Construct a point with the provided initial coordinate values.
 
-    If only z and m are not specified, the type will be a 2D point.
-    If any or both of the others are specified, the Z and M values will be added accordingly.
+ If only z and m are not specified, the type will be a 2D point.
+ If any or both of the others are specified, the Z and M values will be added accordingly.
 %End
 %MethodCode
     double z;

diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h
@@ -50,15 +50,10 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
      * If only z and m are not specified, the type will be a 2D point.
      * If any or both of the others are specified, the Z and M values will be added accordingly.
      */
+#ifndef SIP_RUN
     QgsPoint( double x = 0.0, double y = 0.0, double z = std::numeric_limits<double>::quiet_NaN(), double m = std::numeric_limits<double>::quiet_NaN() ) SIP_SKIP;
-#ifdef SIP_RUN
+#else
     QgsPoint( double x = 0.0, double y = 0.0, SIP_PYOBJECT z = Py_None, SIP_PYOBJECT m = Py_None ) [( double x = 0.0, double y = 0.0, double z = 0.0, double m = 0.0 )];
-    % Docstring
-    Construct a point with the provided initial coordinate values.
-
-    If only z and m are not specified, the type will be a 2D point.
-    If any or both of the others are specified, the Z and M values will be added accordingly.
-    % End
     % MethodCode
     double z;
     double m;