move SIP_CODE to public section

qgis · Apr 30, 2017 · c5dcfc1 · c5dcfc1
1 parent b82c9b8
commit c5dcfc1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip
@@ -290,7 +290,6 @@ Divides the coordinates in this point by a scalar quantity in place
  :rtype: QgsPoint
 %End
 
-  private:
     SIP_PYOBJECT __repr__();
 %MethodCode
     QString str = "(" + QString::number( sipCpp->x() ) + "," + QString::number( sipCpp->y() ) + ")";
@@ -331,9 +330,14 @@ Divides the coordinates in this point by a scalar quantity in place
 %MethodCode
     sipRes = qHash( *sipCpp );
 %End
+
 }; // class QgsPoint
 
 
+
+
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/core/qgspoint.h b/src/core/qgspoint.h
@@ -261,16 +261,6 @@ class CORE_EXPORT QgsPoint
     //! Divides the coordinates in this point by a scalar quantity in place
     QgsPoint &operator/=( double scalar ) { mX /= scalar; mY /= scalar; return *this; }
 
-  private:
-
-    //! x coordinate
-    double mX;
-
-    //! y coordinate
-    double mY;
-
-    friend uint qHash( const QgsPoint &pnt );
-
 #ifdef SIP_RUN
     SIP_PYOBJECT __repr__();
     % MethodCode
@@ -307,26 +297,36 @@ class CORE_EXPORT QgsPoint
     sipRes = qHash( *sipCpp );
     % End
 #endif
+
+  private:
+
+    //! x coordinate
+    double mX;
+
+    //! y coordinate
+    double mY;
+
+    friend uint qHash( const QgsPoint &pnt );
+
 }; // class QgsPoint
 
-#ifndef SIP_RUN
 
-inline bool operator==( const QgsPoint &p1, const QgsPoint &p2 )
+inline bool operator==( const QgsPoint &p1, const QgsPoint &p2 ) SIP_SKIP
 {
   if ( qgsDoubleNear( p1.x(), p2.x() ) && qgsDoubleNear( p1.y(), p2.y() ) )
   { return true; }
   else
   { return false; }
 }
 
-inline std::ostream &operator << ( std::ostream &os, const QgsPoint &p )
+inline std::ostream &operator << ( std::ostream &os, const QgsPoint &p ) SIP_SKIP
 {
   // Use Local8Bit for printouts
   os << p.toString().toLocal8Bit().data();
   return os;
 }
 
-inline uint qHash( const QgsPoint &p )
+inline uint qHash( const QgsPoint &p ) SIP_SKIP
 {
   uint hash;
   uint h1 = qHash( static_cast< quint64 >( p.mX ) );
@@ -335,6 +335,5 @@ inline uint qHash( const QgsPoint &p )
   return hash;
 }
 
-#endif
 
 #endif //QGSPOINT_H