Skip to content

Commit

Permalink
removed /since 3.8 and entered 3.4 instead because of backport
Browse files Browse the repository at this point in the history
  • Loading branch information
signedav committed Apr 11, 2019
1 parent d731246 commit 16ba9a8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions python/core/auto_generated/qgslegendsettings.sip.in
Expand Up @@ -200,7 +200,7 @@ Returns the factor of map units per pixel for symbols with size given in map uni

.. seealso:: :py:func:`setMapUnitsPerPixel`

.. versionadded:: 3.8
.. versionadded:: 3.4
%End

void setMapUnitsPerPixel( double mapUnitsPerPixel );
Expand All @@ -209,7 +209,7 @@ Sets the mmPerMapUnit calculated by ``mapUnitsPerPixel`` mostly taken from the m

.. seealso:: :py:func:`mapUnitsPerPixel`

.. versionadded:: 3.8
.. versionadded:: 3.4
%End

int dpi() const;
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgslegendsettings.h
Expand Up @@ -181,14 +181,14 @@ class CORE_EXPORT QgsLegendSettings
/**
* Returns the factor of map units per pixel for symbols with size given in map units calculated by dpi and mmPerMapUnit
* \see setMapUnitsPerPixel()
* \since QGIS 3.8
* \since QGIS 3.4
*/
double mapUnitsPerPixel() const;

/**
* Sets the mmPerMapUnit calculated by \a mapUnitsPerPixel mostly taken from the map settings.
* \see mapUnitsPerPixel()
* \since QGIS 3.8
* \since QGIS 3.4
*/
void setMapUnitsPerPixel( double mapUnitsPerPixel );

Expand Down
8 changes: 4 additions & 4 deletions src/server/services/wms/qgswmsparameters.h
Expand Up @@ -372,7 +372,7 @@ namespace QgsWms
/**
* Returns SRCWIDTH parameter or an empty string if not defined.
* \returns srcWidth parameter
* \since QGIS 3.8
* \since QGIS 3.4
*/
QString srcWidth() const;

Expand All @@ -382,14 +382,14 @@ namespace QgsWms
* converted.
* \returns srcWidth parameter
* \throws QgsBadRequestException
* \since QGIS 3.8
* \since QGIS 3.4
*/
int srcWidthAsInt() const;

/**
* Returns SRCHEIGHT parameter or an empty string if not defined.
* \returns srcHeight parameter
* \since QGIS 3.8
* \since QGIS 3.4
*/
QString srcHeight() const;

Expand All @@ -399,7 +399,7 @@ namespace QgsWms
* converted.
* \returns srcHeight parameter
* \throws QgsBadRequestException
* \since QGIS 3.8
* \since QGIS 3.4
*/
int srcHeightAsInt() const;

Expand Down
4 changes: 2 additions & 2 deletions src/server/services/wms/qgswmsrenderer.h
Expand Up @@ -294,14 +294,14 @@ namespace QgsWms
/**
* Returns QgsWmsParameter SRCWIDTH if it's a GetLegendGraphics request and otherwise HEIGHT parameter
* \returns height parameter
* \since QGIS 3.4.7
* \since QGIS 3.4
*/
int height() const;

/**
* Returns QgsWmsParameter SRCWIDTH parameter if it's a GetLegendGraphics request and otherwise WIDTH parameter
* \returns width parameter
* \since QGIS 3.4.7
* \since QGIS 3.4
*/
int width() const;

Expand Down

0 comments on commit 16ba9a8

Please sign in to comment.