From 2406837650a6a9072a83fb153cf7f0fd3b784aec Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 15 Oct 2019 15:56:54 +0200 Subject: [PATCH] replace deprecated in by deprecated since (#32260) --- .../geometry/qgsgeometry.sip.in | 4 ++-- .../core/auto_generated/qgsvectorlayer.sip.in | 24 +++++++++---------- .../qgsvectorlayereditutils.sip.in | 16 ++++++------- .../qgscustomdrophandler.sip.in | 4 ++-- .../auto_generated/qgsmaptoolcapture.sip.in | 8 +++---- .../gui/auto_generated/qgsmaptooledit.sip.in | 4 ++-- .../qgsnewvectorlayerdialog.sip.in | 4 ++-- .../symbology/qgsstylemanagerdialog.sip.in | 24 +++++++++---------- src/core/geometry/qgsgeometry.h | 2 +- src/core/qgsdataitem.h | 2 +- src/core/qgsvectorlayer.h | 12 +++++----- src/core/qgsvectorlayereditutils.h | 8 +++---- src/gui/qgscustomdrophandler.h | 2 +- src/gui/qgsmaptoolcapture.h | 4 ++-- src/gui/qgsmaptooledit.h | 2 +- src/gui/qgsnewvectorlayerdialog.h | 2 +- src/gui/symbology/qgsstylemanagerdialog.h | 12 +++++----- 17 files changed, 67 insertions(+), 67 deletions(-) diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in index 640bb9c2c1a..123bded10af 100644 --- a/python/core/auto_generated/geometry/qgsgeometry.sip.in +++ b/python/core/auto_generated/geometry/qgsgeometry.sip.in @@ -850,8 +850,8 @@ Splits this geometry according to a given line. :return: OperationResult a result code: success or reason of failure -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector &newGeometries /Out/, bool topological, QgsPointSequence &topologyTestPoints /Out/ ); diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in index 5536403c776..8c8cddf1c0b 100644 --- a/python/core/auto_generated/qgsvectorlayer.sip.in +++ b/python/core/auto_generated/qgsvectorlayer.sip.in @@ -1260,8 +1260,8 @@ Adds a ring to polygon/multipolygon features to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End @@ -1338,8 +1338,8 @@ Adds a new part polygon to a multipart feature to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult addPart( const QVector &ring ) /PyName=addPartV2,Deprecated/; @@ -1367,8 +1367,8 @@ Adds a new part polygon to a multipart feature to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult addPart( const QgsPointSequence &ring ) /PyName=addPartV2/; @@ -1453,8 +1453,8 @@ Splits parts cut by the given line to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult splitParts( const QgsPointSequence &splitLine, bool topologicalEditing = false ); @@ -1504,8 +1504,8 @@ Splits features cut by the given line to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult splitFeatures( const QgsPointSequence &splitLine, bool topologicalEditing = false ); @@ -1570,8 +1570,8 @@ editing. to the underlying data provider until a commitChanges() call is made. Any uncommitted changes can be discarded by calling rollBack(). -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End int addTopologicalPoints( const QgsPoint &p ); diff --git a/python/core/auto_generated/qgsvectorlayereditutils.sip.in b/python/core/auto_generated/qgsvectorlayereditutils.sip.in index fc811d0c98d..3fe7adea0d9 100644 --- a/python/core/auto_generated/qgsvectorlayereditutils.sip.in +++ b/python/core/auto_generated/qgsvectorlayereditutils.sip.in @@ -71,8 +71,8 @@ Adds a ring to polygon/multipolygon features :return: OperationResult result code: success or reason of failure -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult addRing( const QgsPointSequence &ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 ); @@ -113,8 +113,8 @@ Adds a new part polygon to a multipart feature - QgsGeometry.InvalidBaseGeometry - QgsGeometry.InvalidInput -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult addPart( const QgsPointSequence &ring, QgsFeatureId featureId ); @@ -173,8 +173,8 @@ Splits parts cut by the given line - QgsGeometry.GeometryEngineError - QgsGeometry.SplitCannotSplitPoint -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult splitParts( const QgsPointSequence &splitLine, bool topologicalEditing = false ); @@ -203,8 +203,8 @@ Splits features cut by the given line :return: 0 in case of success, 4 if there is a selection but no feature split -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End QgsGeometry::OperationResult splitFeatures( const QgsPointSequence &splitLine, bool topologicalEditing = false ); diff --git a/python/gui/auto_generated/qgscustomdrophandler.sip.in b/python/gui/auto_generated/qgscustomdrophandler.sip.in index cc4ff647051..2abe493dbcc 100644 --- a/python/gui/auto_generated/qgscustomdrophandler.sip.in +++ b/python/gui/auto_generated/qgscustomdrophandler.sip.in @@ -89,8 +89,8 @@ Accordingly, only implementations must be lightweight and return ASAP. (For instance by copying the relevant parts of ``data`` and then handling the data after a short timeout). -.. deprecated:: - in QGIS 3.10 - use handleMimeDataV2() instead. +.. deprecated:: QGIS 3.10 + - use handleMimeDataV2() instead. %End virtual bool handleMimeDataV2( const QMimeData *data ); diff --git a/python/gui/auto_generated/qgsmaptoolcapture.sip.in b/python/gui/auto_generated/qgsmaptoolcapture.sip.in index 635fd5b6787..3d3f1e0804d 100644 --- a/python/gui/auto_generated/qgsmaptoolcapture.sip.in +++ b/python/gui/auto_generated/qgsmaptoolcapture.sip.in @@ -219,8 +219,8 @@ List of digitized points :return: List of points -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant returns QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant returns QgsPoint objects instead of QgsPointXY. %End @@ -239,8 +239,8 @@ Set the points on which to work :param pointList: A list of points -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End void setPoints( const QgsPointSequence &pointList ); diff --git a/python/gui/auto_generated/qgsmaptooledit.sip.in b/python/gui/auto_generated/qgsmaptooledit.sip.in index e447bee4c20..30530d0936d 100644 --- a/python/gui/auto_generated/qgsmaptooledit.sip.in +++ b/python/gui/auto_generated/qgsmaptooledit.sip.in @@ -73,8 +73,8 @@ Returns the current vector layer of the map canvas or 0 Adds a list of ``vertices`` to other features to keep topology up to date, e.g. to neighbouring polygons. The ``vertices`` list specifies a set of topological points to add, in the layer's coordinate reference system. -.. deprecated:: - in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. +.. deprecated:: QGIS 3.12 + - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. %End TopologicalResult addTopologicalPoints( const QVector &vertices ); diff --git a/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in b/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in index b3acc41a012..c70e503be58 100644 --- a/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in +++ b/python/gui/auto_generated/qgsnewvectorlayerdialog.sip.in @@ -26,8 +26,8 @@ If the ``initialPath`` argument is specified, then the dialog will default to th :return: fileName on success, empty string use aborted, QString() if creation failed -.. deprecated:: - in QGIS 3.4.5 - use execAndCreateLayer() instead. +.. deprecated:: QGIS 3.4.5 + - use execAndCreateLayer() instead. %End static QString execAndCreateLayer( QString &errorMessage /Out/, QWidget *parent = 0, const QString &initialPath = QString(), QString *encoding /Out/ = 0, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() ); diff --git a/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in b/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in index 0eff0150f74..353859c3fec 100644 --- a/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in +++ b/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in @@ -154,8 +154,8 @@ Opens the associated help void itemChanged( QStandardItem *item ) /Deprecated/; %Docstring -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End void groupChanged( const QModelIndex & ); @@ -196,8 +196,8 @@ Triggers the dialog for editing the selected smart group. void regrouped( QStandardItem * ) /Deprecated/; %Docstring -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End void filterSymbols( const QString &filter ); @@ -250,8 +250,8 @@ Remove all tags from selected symbols %Docstring Populate combo box with known style items (symbols, color ramps). -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End void populateGroups(); @@ -262,8 +262,8 @@ populate the groups void setSymbolsChecked( const QStringList & ) /Deprecated/; %Docstring -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End void populateSymbols( const QStringList &symbolNames, bool checkable = false ) /Deprecated/; @@ -300,15 +300,15 @@ add a new color ramp to style bool removeSymbol() /Deprecated/; %Docstring -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End bool removeColorRamp() /Deprecated/; %Docstring -.. deprecated:: - in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 +.. deprecated:: QGIS 3.6 + - has no effect and will be removed in QGIS 4.0 %End void enableSymbolInputs( bool ); diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h index 0023ca4dc5a..bf23b61a863 100644 --- a/src/core/geometry/qgsgeometry.h +++ b/src/core/geometry/qgsgeometry.h @@ -881,7 +881,7 @@ class CORE_EXPORT QgsGeometry * \param topological TRUE if topological editing is enabled * \param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset * \returns OperationResult a result code: success or reason of failure - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED OperationResult splitGeometry( const QVector &splitLine, QVector &newGeometries SIP_OUT, bool topological, QVector &topologyTestPoints SIP_OUT ) SIP_DEPRECATED; diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index 300c2216502..7800167d232 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -220,7 +220,7 @@ class CORE_EXPORT QgsDataItem : public QObject enum Capability { NoCapabilities = 0, - SetCrs = 1 << 0, //!< Can set CRS on layer or group of layers. \deprecated in QGIS 3.6 -- no longer used by QGIS and will be removed in QGIS 4.0 + SetCrs = 1 << 0, //!< Can set CRS on layer or group of layers. \deprecated since QGIS 3.6 -- no longer used by QGIS and will be removed in QGIS 4.0 Fertile = 1 << 1, //!< Can create children. Even items without this capability may have children, but cannot create them, it means that children are created by item ancestors. Fast = 1 << 2, //!< CreateChildren() is fast enough to be run in main thread when refreshing items, most root items (wms,wfs,wcs,postgres...) are considered fast because they are reading data only from QgsSettings Collapse = 1 << 3, //!< The collapse/expand status for this items children should be ignored in order to avoid undesired network connections (wms etc.) diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 82fdb8b33c9..2c3a746402e 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -1267,7 +1267,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult addRing( const QVector &ring, QgsFeatureId *featureId = nullptr ) SIP_DEPRECATED; @@ -1328,7 +1328,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult addPart( const QList &ring ) SIP_DEPRECATED; @@ -1348,7 +1348,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult addPart( const QVector &ring ) SIP_PYNAME( addPartV2 ) SIP_DEPRECATED; @@ -1409,7 +1409,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult splitParts( const QVector &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED; @@ -1448,7 +1448,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult splitFeatures( const QVector &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED; @@ -1494,7 +1494,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte * by a call to startEditing(). Changes made to features using this method are not committed * to the underlying data provider until a commitChanges() call is made. Any uncommitted * changes can be discarded by calling rollBack(). - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED int addTopologicalPoints( const QgsPointXY &p ) SIP_DEPRECATED; diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h index defc692226c..2992cd06fd0 100644 --- a/src/core/qgsvectorlayereditutils.h +++ b/src/core/qgsvectorlayereditutils.h @@ -77,7 +77,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils * all intersecting features are tested and the ring is added to the first valid feature. * \param modifiedFeatureId if specified, feature ID for feature that ring was added to will be stored in this parameter * \return OperationResult result code: success or reason of failure - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult addRing( const QVector &ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = nullptr ) SIP_DEPRECATED; @@ -109,7 +109,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils * - QgsGeometry::AddPartNotMultiGeometry * - QgsGeometry::InvalidBaseGeometry * - QgsGeometry::InvalidInput - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult addPart( const QVector &ring, QgsFeatureId featureId ) SIP_DEPRECATED; @@ -158,7 +158,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils * - QgsGeometry::InvalidBaseGeometry * - QgsGeometry::GeometryEngineError * - QgsGeometry::SplitCannotSplitPoint - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult splitParts( const QVector &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED; @@ -182,7 +182,7 @@ class CORE_EXPORT QgsVectorLayerEditUtils * \param topologicalEditing TRUE if topological editing is enabled * \returns 0 in case of success, * 4 if there is a selection but no feature split - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QgsGeometry::OperationResult splitFeatures( const QVector &splitLine, bool topologicalEditing = false ) SIP_DEPRECATED; diff --git a/src/gui/qgscustomdrophandler.h b/src/gui/qgscustomdrophandler.h index 3ad3ac73d43..56500250f16 100644 --- a/src/gui/qgscustomdrophandler.h +++ b/src/gui/qgscustomdrophandler.h @@ -100,7 +100,7 @@ class GUI_EXPORT QgsCustomDropHandler : public QObject * (For instance by copying the relevant parts of \a data and then handling * the data after a short timeout). * - * \deprecated in QGIS 3.10 - use handleMimeDataV2() instead. + * \deprecated since QGIS 3.10 - use handleMimeDataV2() instead. */ Q_DECL_DEPRECATED virtual void handleMimeData( const QMimeData *data ) SIP_DEPRECATED; diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h index 56d4ebb3e51..14c70279304 100644 --- a/src/gui/qgsmaptoolcapture.h +++ b/src/gui/qgsmaptoolcapture.h @@ -224,7 +224,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing /** * List of digitized points * \returns List of points - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant returns QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant returns QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED QVector points() const SIP_DEPRECATED; @@ -241,7 +241,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing * Set the points on which to work * * \param pointList A list of points - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED void setPoints( const QVector &pointList ) SIP_DEPRECATED; diff --git a/src/gui/qgsmaptooledit.h b/src/gui/qgsmaptooledit.h index 90dd9eb99a3..7a8bda2b2c6 100644 --- a/src/gui/qgsmaptooledit.h +++ b/src/gui/qgsmaptooledit.h @@ -78,7 +78,7 @@ class GUI_EXPORT QgsMapToolEdit: public QgsMapTool /** * Adds a list of \a vertices to other features to keep topology up to date, e.g. to neighbouring polygons. * The \a vertices list specifies a set of topological points to add, in the layer's coordinate reference system. - * \deprecated in QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. + * \deprecated since QGIS 3.12 - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY. */ Q_DECL_DEPRECATED TopologicalResult addTopologicalPoints( const QVector &vertices ) SIP_DEPRECATED; diff --git a/src/gui/qgsnewvectorlayerdialog.h b/src/gui/qgsnewvectorlayerdialog.h index 1464145a6ee..2890d6bad9f 100644 --- a/src/gui/qgsnewvectorlayerdialog.h +++ b/src/gui/qgsnewvectorlayerdialog.h @@ -42,7 +42,7 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect * * \returns fileName on success, empty string use aborted, QString() if creation failed * - * \deprecated in QGIS 3.4.5 - use execAndCreateLayer() instead. + * \deprecated since QGIS 3.4.5 - use execAndCreateLayer() instead. */ Q_DECL_DEPRECATED static QString runAndCreateLayer( QWidget *parent = nullptr, QString *enc = nullptr, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(), const QString &initialPath = QString() ) SIP_DEPRECATED; diff --git a/src/gui/symbology/qgsstylemanagerdialog.h b/src/gui/symbology/qgsstylemanagerdialog.h index e35829845bb..6be053a639c 100644 --- a/src/gui/symbology/qgsstylemanagerdialog.h +++ b/src/gui/symbology/qgsstylemanagerdialog.h @@ -192,7 +192,7 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan void showHelp(); /** - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED void itemChanged( QStandardItem *item ) SIP_DEPRECATED; @@ -232,7 +232,7 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan void editSmartgroupAction(); /** - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED void regrouped( QStandardItem * ) SIP_DEPRECATED; @@ -269,7 +269,7 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan /** * Populate combo box with known style items (symbols, color ramps). * - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED void populateTypes() SIP_DEPRECATED; @@ -277,7 +277,7 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan void populateGroups(); /** - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED void setSymbolsChecked( const QStringList & ) SIP_DEPRECATED; @@ -307,12 +307,12 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan bool editColorRamp(); /** - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED bool removeSymbol() SIP_DEPRECATED; /** - * \deprecated in QGIS 3.6 - has no effect and will be removed in QGIS 4.0 + * \deprecated since QGIS 3.6 - has no effect and will be removed in QGIS 4.0 */ Q_DECL_DEPRECATED bool removeColorRamp() SIP_DEPRECATED;