diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip index 8b51fe94fc5..2e1d6f017a5 100644 --- 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 index 6a0c8b4ec8a..167057596c8 100644 --- 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,11 +297,21 @@ 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; } @@ -319,14 +319,14 @@ inline bool operator==( const QgsPoint &p1, const QgsPoint &p2 ) { 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