Skip to content
Permalink
Browse files

Fix dox test

  • Loading branch information
nyalldawson committed Dec 21, 2019
1 parent ad825c9 commit f44c2294057b23da2891906203c754c54f24ac2e
@@ -114,17 +114,15 @@ Sets the maximum number of polygon label ``candidates`` per centimeter squared.
Gets number of candidate positions that will be generated for each label feature.

.. deprecated:: QGIS 3.12
use maximumPolygonCandidatesPerCmSquared() and
maximumLineCandidatesPerCm() instead.
use maximumPolygonCandidatesPerCmSquared() and maximumLineCandidatesPerCm() instead.
%End

void setNumCandidatePositions( int candPoint, int candLine, int candPolygon ) /Deprecated/;
%Docstring
Sets the number of candidate positions that will be generated for each label feature.

.. deprecated:: QGIS 3.12
use setMaximumPolygonCandidatesPerCmSquared() and
setMaximumLineCandidatesPerCm() instead.
use setMaximumPolygonCandidatesPerCmSquared() and setMaximumLineCandidatesPerCm() instead.
%End

void setSearchMethod( Search s ) /Deprecated/;
@@ -117,8 +117,7 @@ class CORE_EXPORT QgsLabelingEngineSettings

/**
* Gets number of candidate positions that will be generated for each label feature.
* \deprecated Since QGIS 3.12 use maximumPolygonCandidatesPerCmSquared() and
* maximumLineCandidatesPerCm() instead.
* \deprecated since QGIS 3.12 use maximumPolygonCandidatesPerCmSquared() and maximumLineCandidatesPerCm() instead.
*/
Q_DECL_DEPRECATED void numCandidatePositions( int &candPoint, int &candLine, int &candPolygon ) const SIP_DEPRECATED
{
@@ -129,8 +128,7 @@ class CORE_EXPORT QgsLabelingEngineSettings

/**
* Sets the number of candidate positions that will be generated for each label feature.
* \deprecated Since QGIS 3.12 use setMaximumPolygonCandidatesPerCmSquared() and
* setMaximumLineCandidatesPerCm() instead.
* \deprecated since QGIS 3.12 use setMaximumPolygonCandidatesPerCmSquared() and setMaximumLineCandidatesPerCm() instead.
*/
Q_DECL_DEPRECATED void setNumCandidatePositions( int candPoint, int candLine, int candPolygon ) SIP_DEPRECATED
{
@@ -176,7 +176,7 @@ namespace pal
/**
* Returns the maximum number of line label candidate positions per map unit.
*
* \see setMaximumLineCandidatesPerCm()
* \see setMaximumLineCandidatesPerMapUnit()
*/
double maximumLineCandidatesPerMapUnit() const { return mMaxLineCandidatesPerMapUnit; }

0 comments on commit f44c229

Please sign in to comment.
You can’t perform that action at this time.