diff --git a/python/PyQt6/core/auto_generated/geometry/qgsrectangle.sip.in b/python/PyQt6/core/auto_generated/geometry/qgsrectangle.sip.in index 610a53069ea5..44fdbfef968a 100644 --- a/python/PyQt6/core/auto_generated/geometry/qgsrectangle.sip.in +++ b/python/PyQt6/core/auto_generated/geometry/qgsrectangle.sip.in @@ -25,9 +25,6 @@ Examples are storing a layer extent or the current view extent of a map %TypeHeaderCode #include "qgsrectangle.h" %End - public: - static const QMetaObject staticMetaObject; - public: QgsRectangle(); // optimised constructor for null rectangle - no need to call normalize here diff --git a/python/PyQt6/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in b/python/PyQt6/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in index ab46415bc187..4c0103c2d7d1 100644 --- a/python/PyQt6/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in +++ b/python/PyQt6/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in @@ -49,7 +49,6 @@ Constructor for QgsCoordinateTransformContext. QgsCoordinateTransformContext( const QgsCoordinateTransformContext &rhs ); bool operator==( const QgsCoordinateTransformContext &rhs ) const; - bool operator!=( const QgsCoordinateTransformContext &rhs ) const; void clear(); %Docstring diff --git a/python/core/auto_generated/geometry/qgsrectangle.sip.in b/python/core/auto_generated/geometry/qgsrectangle.sip.in index 610a53069ea5..44fdbfef968a 100644 --- a/python/core/auto_generated/geometry/qgsrectangle.sip.in +++ b/python/core/auto_generated/geometry/qgsrectangle.sip.in @@ -25,9 +25,6 @@ Examples are storing a layer extent or the current view extent of a map %TypeHeaderCode #include "qgsrectangle.h" %End - public: - static const QMetaObject staticMetaObject; - public: QgsRectangle(); // optimised constructor for null rectangle - no need to call normalize here diff --git a/python/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in b/python/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in index ab46415bc187..4c0103c2d7d1 100644 --- a/python/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in +++ b/python/core/auto_generated/proj/qgscoordinatetransformcontext.sip.in @@ -49,7 +49,6 @@ Constructor for QgsCoordinateTransformContext. QgsCoordinateTransformContext( const QgsCoordinateTransformContext &rhs ); bool operator==( const QgsCoordinateTransformContext &rhs ) const; - bool operator!=( const QgsCoordinateTransformContext &rhs ) const; void clear(); %Docstring diff --git a/src/core/geometry/qgsrectangle.cpp b/src/core/geometry/qgsrectangle.cpp index b3a18e6ea342..37fbb9e89478 100644 --- a/src/core/geometry/qgsrectangle.cpp +++ b/src/core/geometry/qgsrectangle.cpp @@ -22,7 +22,6 @@ #include "qgsbox3d.h" #include "qgspolygon.h" #include "qgslinestring.h" -#include "moc_qgsrectangle.cpp" #include #include diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h index ec335968a2f9..81500f6c70d0 100644 --- a/src/core/geometry/qgsrectangle.h +++ b/src/core/geometry/qgsrectangle.h @@ -40,20 +40,6 @@ class QgsBox3D; */ class CORE_EXPORT QgsRectangle { - Q_GADGET - - Q_PROPERTY( double xMinimum READ xMinimum WRITE setXMinimum ) - Q_PROPERTY( double xMaximum READ xMaximum WRITE setXMaximum ) - Q_PROPERTY( double yMinimum READ yMinimum WRITE setYMinimum ) - Q_PROPERTY( double yMaximum READ yMaximum WRITE setYMaximum ) - Q_PROPERTY( double width READ width ) - Q_PROPERTY( double height READ height ) - Q_PROPERTY( double area READ area ) - Q_PROPERTY( double perimeter READ perimeter ) - Q_PROPERTY( QgsPointXY center READ center ) - Q_PROPERTY( bool isEmpty READ isEmpty ) - Q_PROPERTY( bool isNull READ isNull ) - public: //! Constructor for a null rectangle @@ -532,12 +518,12 @@ class CORE_EXPORT QgsRectangle /** * Returns a string representation of the rectangle in WKT format. */ - Q_INVOKABLE QString asWktCoordinates() const; + QString asWktCoordinates() const; /** * Returns a string representation of the rectangle as a WKT Polygon. */ - Q_INVOKABLE QString asWktPolygon() const; + QString asWktPolygon() const; /** * Returns a QRectF with same coordinates as the rectangle. @@ -552,7 +538,7 @@ class CORE_EXPORT QgsRectangle * Coordinates will be truncated to the specified precision. * If the specified precision is less than 0, a suitable minimum precision is used. */ - Q_INVOKABLE QString toString( int precision = 16 ) const; + QString toString( int precision = 16 ) const; /** * Returns the rectangle as a polygon. diff --git a/src/core/locator/qgslocatorcontext.h b/src/core/locator/qgslocatorcontext.h index 70934a7a59dc..325e6cc1be2b 100644 --- a/src/core/locator/qgslocatorcontext.h +++ b/src/core/locator/qgslocatorcontext.h @@ -34,7 +34,6 @@ class CORE_EXPORT QgsLocatorContext Q_PROPERTY( QgsRectangle targetExtent MEMBER targetExtent ) Q_PROPERTY( QgsCoordinateReferenceSystem targetExtentCrs MEMBER targetExtentCrs ) - Q_PROPERTY( QgsCoordinateTransformContext transformContext MEMBER transformContext ) Q_PROPERTY( bool usingPrefix MEMBER usingPrefix ) public: diff --git a/src/core/proj/qgscoordinatetransformcontext.cpp b/src/core/proj/qgscoordinatetransformcontext.cpp index 4a4dfc8eea6e..f61b40792044 100644 --- a/src/core/proj/qgscoordinatetransformcontext.cpp +++ b/src/core/proj/qgscoordinatetransformcontext.cpp @@ -65,11 +65,6 @@ bool QgsCoordinateTransformContext::operator==( const QgsCoordinateTransformCont return equal; } -bool QgsCoordinateTransformContext::operator!=( const QgsCoordinateTransformContext &rhs ) const -{ - return !( *this == rhs ); -} - void QgsCoordinateTransformContext::clear() { d.detach(); diff --git a/src/core/proj/qgscoordinatetransformcontext.h b/src/core/proj/qgscoordinatetransformcontext.h index 7779a0e0366a..7f62c7b6e1b6 100644 --- a/src/core/proj/qgscoordinatetransformcontext.h +++ b/src/core/proj/qgscoordinatetransformcontext.h @@ -67,8 +67,7 @@ class CORE_EXPORT QgsCoordinateTransformContext QgsCoordinateTransformContext( const QgsCoordinateTransformContext &rhs ); QgsCoordinateTransformContext &operator=( const QgsCoordinateTransformContext &rhs ) SIP_SKIP; - bool operator==( const QgsCoordinateTransformContext &rhs ) const; - bool operator!=( const QgsCoordinateTransformContext &rhs ) const; + bool operator==( const QgsCoordinateTransformContext &rhs ) const ; /** * Clears all stored transform information from the context.