No more QgsGeometry pointers in the public API

Geometries are passed as const reference and returned by value.
This make using the API easier and reduces the risk of ownership
problems.

The overhead is minimal due to implicit sharing.

Fix qgis/qgis4.0_api#68

Author: m-kuhn

python/core/geometry/qgsgeometry.sip

@@ -496,13 +496,6 @@ not disjoint with existing polygons of the feature
  :rtype: int
 %End
 
-    int makeDifference( const QgsGeometry *other );
-%Docstring
- Changes this geometry such that it does not intersect the other geometry
- \param other geometry that should not be intersect
- :return: 0 in case of success
- :rtype: int
-%End
 
     QgsGeometry makeDifference( const QgsGeometry &other ) const;
 %Docstring

python/core/qgsgeometryvalidator.sip

@@ -16,7 +16,7 @@ class QgsGeometryValidator : QThread
 %End
   public:
 
-    QgsGeometryValidator( const QgsGeometry *g, QList<QgsGeometry::Error> *errors = 0, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
+    QgsGeometryValidator( const QgsGeometry &geoemtry, QList<QgsGeometry::Error> *errors = 0, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
 %Docstring
  Constructor for QgsGeometryValidator.
 %End
@@ -26,7 +26,7 @@ class QgsGeometryValidator : QThread
 
     void stop();
 
-    static void validateGeometry( const QgsGeometry *g, QList<QgsGeometry::Error> &errors /Out/, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
+    static void validateGeometry( const QgsGeometry &geometry, QList<QgsGeometry::Error> &errors /Out/, QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal );
 %Docstring
 Validate geometry and produce a list of geometry errors
 %End

python/core/qgsogcutils.sip

@@ -59,7 +59,7 @@ Read rectangle from GML3 Envelope
  :rtype: QgsRectangle
 %End
 
-    static QDomElement geometryToGML( const QgsGeometry *geometry, QDomDocument &doc,
+    static QDomElement geometryToGML( const QgsGeometry &geometry, QDomDocument &doc,
                                       QgsOgcUtils::GMLVersion gmlVersion,
                                       const QString &srsName,
                                       bool invertAxisOrientation,
@@ -72,14 +72,14 @@ Read rectangle from GML3 Envelope
  :rtype: QDomElement
 %End
 
-    static QDomElement geometryToGML( const QgsGeometry *geometry, QDomDocument &doc, const QString &format, int precision = 17 );
+    static QDomElement geometryToGML( const QgsGeometry &geometry, QDomDocument &doc, const QString &format, int precision = 17 );
 %Docstring
  Exports the geometry to GML2 or GML3
 :return: QDomElement
  :rtype: QDomElement
 %End
 
-    static QDomElement geometryToGML( const QgsGeometry *geometry, QDomDocument &doc, int precision = 17 );
+    static QDomElement geometryToGML( const QgsGeometry &geometry, QDomDocument &doc, int precision = 17 );
 %Docstring
  Exports the geometry to GML2
 :return: QDomElement

python/core/qgspallabeling.sip

@@ -415,7 +415,7 @@ Z-Index of label, where labels with a higher z-index are rendered on top of labe
 
     void calculateLabelSize( const QFontMetricsF *fm, QString text, double &labelX, double &labelY, QgsFeature *f = 0, QgsRenderContext *context = 0 );
 
-    void registerFeature( QgsFeature &f, QgsRenderContext &context );
+    void registerFeature( QgsFeature &f, QgsRenderContext &context  );
 
 %Docstring
  Register a feature for labeling.
@@ -553,7 +553,7 @@ class QgsPalLabeling
 %End
 
 
-    static QgsGeometry prepareGeometry( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, QgsGeometry *clipGeometry = 0 ) /Factory/;
+    static QgsGeometry prepareGeometry( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, const QgsGeometry &clipGeometry = QgsGeometry() ) /Factory/;
 %Docstring
  Prepares a geometry for registration with PAL. Handles reprojection, rotation, clipping, etc.
  \param geometry geometry to prepare
@@ -565,7 +565,7 @@ class QgsPalLabeling
  :rtype: QgsGeometry
 %End
 
-    static bool geometryRequiresPreparation( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, QgsGeometry *clipGeometry = 0 );
+    static bool geometryRequiresPreparation( const QgsGeometry &geometry, QgsRenderContext &context, const QgsCoordinateTransform &ct, const QgsGeometry &clipGeometry = QgsGeometry() );
 %Docstring
  Checks whether a geometry requires preparation before registration with PAL
  \param geometry geometry to prepare
@@ -599,49 +599,6 @@ class QgsPalLabeling
  :rtype: list of str
 %End
 
-  protected:
-    static void dataDefinedTextStyle( QgsPalLayerSettings &tmpLyr,
-                                      const QMap< QgsPalLayerSettings::Property, QVariant > &ddValues );
-%Docstring
-Update temporary QgsPalLayerSettings with any data defined text style values
-%End
-
-    static void dataDefinedTextFormatting( QgsPalLayerSettings &tmpLyr,
-                                           const QMap< QgsPalLayerSettings::Property, QVariant > &ddValues );
-%Docstring
-Update temporary QgsPalLayerSettings with any data defined text formatting values
-%End
-
-    static void dataDefinedTextBuffer( QgsPalLayerSettings &tmpLyr,
-                                       const QMap< QgsPalLayerSettings::Property, QVariant > &ddValues );
-%Docstring
-Update temporary QgsPalLayerSettings with any data defined text buffer values
-%End
-
-    static void dataDefinedShapeBackground( QgsPalLayerSettings &tmpLyr,
-                                            const QMap< QgsPalLayerSettings::Property, QVariant > &ddValues );
-%Docstring
-Update temporary QgsPalLayerSettings with any data defined shape background values
-%End
-
-    static void dataDefinedDropShadow( QgsPalLayerSettings &tmpLyr,
-                                       const QMap< QgsPalLayerSettings::Property, QVariant > &ddValues );
-%Docstring
-Update temporary QgsPalLayerSettings with any data defined drop shadow values
-%End
-
-
-    static bool checkMinimumSizeMM( const QgsRenderContext &context, const QgsGeometry *geom, double minSize );
-%Docstring
- Checks whether a geometry exceeds the minimum required size for a geometry to be labeled.
- \param context render context
- \param geom geometry
- \param minSize minimum size for geometry
- :return: true if geometry exceeds minimum size
-.. versionadded:: 2.9
- :rtype: bool
-%End
-
 };
 
 /************************************************************************

python/core/qgsvectordataprovider.sip

@@ -556,7 +556,7 @@ Returns a list of available encodings
 .. versionadded:: 3.0
 %End
 
-    QgsGeometry *convertToProviderType( const QgsGeometry &geom ) const /Factory/;
+    QgsGeometry convertToProviderType( const QgsGeometry &geom ) const;
 %Docstring
  Converts the geometry to the provider type if possible / necessary
  :return: the converted geometry or None if no conversion was necessary or possible

src/app/nodetool/qgsnodetool.cpp

@@ -1828,7 +1828,7 @@ void QgsNodeTool::GeometryValidation::start( QgsGeometry &geom, QgsNodeTool *t,
   if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 2 )
     method = QgsGeometry::ValidatorGeos;
 
-  validator = new QgsGeometryValidator( &geom, nullptr, method );
+  validator = new QgsGeometryValidator( geom, nullptr, method );
   connect( validator, &QgsGeometryValidator::errorFound, tool, &QgsNodeTool::validationErrorFound );
   connect( validator, &QThread::finished, tool, &QgsNodeTool::validationFinished );
   validator->start();

src/app/nodetool/qgsselectedfeature.cpp

@@ -188,7 +188,7 @@ void QgsSelectedFeature::validateGeometry( QgsGeometry *g )
   QgsGeometry::ValidationMethod method = QgsGeometry::ValidatorQgisInternal;
   if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 2 )
     method = QgsGeometry::ValidatorGeos;
-  mValidator = new QgsGeometryValidator( g, nullptr, method );
+  mValidator = new QgsGeometryValidator( *g, nullptr, method );
   connect( mValidator, &QgsGeometryValidator::errorFound, this, &QgsSelectedFeature::addError );
   connect( mValidator, &QThread::finished, this, &QgsSelectedFeature::validationFinished );
   mValidator->start();

src/app/qgsmaptooloffsetcurve.cpp

@@ -477,9 +477,3 @@ QgsGeometry QgsMapToolOffsetCurve::convertToSingleLine( const QgsGeometry &geom,
   }
   return QgsGeometry();
 }
-
-QgsGeometry *QgsMapToolOffsetCurve::convertToMultiLine( QgsGeometry *geom )
-{
-  Q_UNUSED( geom );
-  return nullptr;
-}

src/app/qgsmaptooloffsetcurve.h

@@ -72,8 +72,6 @@ class APP_EXPORT QgsMapToolOffsetCurve: public QgsMapToolEdit
     QgsGeometry linestringFromPolygon( const QgsGeometry &featureGeom, int vertex );
     //! Returns a single line from a multiline (or does nothing if geometry is already a single line). Deletes the input geometry
     QgsGeometry convertToSingleLine( const QgsGeometry &geom, int vertex, bool &isMulti );
-    //! Converts offset line back to a multiline if necessary
-    QgsGeometry *convertToMultiLine( QgsGeometry *geom );
 };
 
 #endif // QGSMAPTOOLOFFSETCURVE_H

src/core/geometry/qgsgeometry.cpp

@@ -836,16 +836,16 @@ int QgsGeometry::reshapeGeometry( const QgsLineString &reshapeLineString )
   return errorCode;
 }
 
-int QgsGeometry::makeDifference( const QgsGeometry *other )
+int QgsGeometry::makeDifferenceInPlace( const QgsGeometry &other )
 {
-  if ( !d->geometry || !other->d->geometry )
+  if ( !d->geometry || !other.d->geometry )
   {
     return 0;
   }
 
   QgsGeos geos( d->geometry );
 
-  QgsAbstractGeometry *diffGeom = geos.intersection( *( other->geometry() ) );
+  QgsAbstractGeometry *diffGeom = geos.intersection( *other.geometry() );
   if ( !diffGeom )
   {
     return 1;
@@ -1964,7 +1964,7 @@ QgsGeometry QgsGeometry::makeValid()
 
 void QgsGeometry::validateGeometry( QList<QgsGeometry::Error> &errors, ValidationMethod method )
 {
-  QgsGeometryValidator::validateGeometry( this, errors, method );
+  QgsGeometryValidator::validateGeometry( *this, errors, method );
 }
 
 bool QgsGeometry::isGeosValid() const