From b2e3f5381dcd9545b0cf0317ac8cc17225e25732 Mon Sep 17 00:00:00 2001 From: t0b3 Date: Fri, 20 Dec 2024 08:46:39 +0100 Subject: [PATCH] Revert "fix(Sip): update sip since rebase" This reverts commit 4eab5313e6b60396c0012d6244e1148efb2c7946. --- .../3d/auto_generated/qgs3dmapsettings.sip.in | 30 +++++++++---------- .../3d/auto_generated/qgs3dmapsettings.sip.in | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/python/3d/auto_generated/qgs3dmapsettings.sip.in b/python/3d/auto_generated/qgs3dmapsettings.sip.in index 7502ae7903f65..688d567a93b15 100644 --- a/python/3d/auto_generated/qgs3dmapsettings.sip.in +++ b/python/3d/auto_generated/qgs3dmapsettings.sip.in @@ -230,7 +230,7 @@ Sets the terrain settings. .. versionadded:: 3.42 %End - void setTerrainVerticalScale( double zScale ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setTerrainVerticalScale( double zScale ) /Deprecated/; %Docstring Sets vertical scale (exaggeration) of terrain (1 = true scale, > 1 = hills get more pronounced) @@ -240,7 +240,7 @@ Sets vertical scale (exaggeration) of terrain Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double terrainVerticalScale() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double terrainVerticalScale() const /Deprecated/; %Docstring Returns vertical scale (exaggeration) of terrain @@ -249,7 +249,7 @@ Returns vertical scale (exaggeration) of terrain Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMapTileResolution( int res ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMapTileResolution( int res ) /Deprecated/; %Docstring Sets resolution (in pixels) of the texture of a terrain tile @@ -260,7 +260,7 @@ Sets resolution (in pixels) of the texture of a terrain tile Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - int mapTileResolution() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + int mapTileResolution() const /Deprecated/; %Docstring Returns resolution (in pixels) of the texture of a terrain tile. This parameter influences how many zoom levels for terrain tiles there will be (together with :py:func:`~Qgs3DMapSettings.maxTerrainGroundError`) @@ -270,7 +270,7 @@ how many zoom levels for terrain tiles there will be (together with :py:func:`~Q Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMaxTerrainScreenError( double error ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMaxTerrainScreenError( double error ) /Deprecated/; %Docstring Sets maximum allowed screen error of terrain tiles in pixels. @@ -281,7 +281,7 @@ Sets maximum allowed screen error of terrain tiles in pixels. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double maxTerrainScreenError() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double maxTerrainScreenError() const /Deprecated/; %Docstring Returns maximum allowed screen error of terrain tiles in pixels. This parameter decides how aggressively less detailed terrain tiles are swapped to more detailed ones as camera gets closer. @@ -294,7 +294,7 @@ be swapped by more detailed tiles with lower error. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMaxTerrainGroundError( double error ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMaxTerrainGroundError( double error ) /Deprecated/; %Docstring Sets the maximum ground error of terrain tiles in world units. @@ -305,7 +305,7 @@ Sets the maximum ground error of terrain tiles in world units. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double maxTerrainGroundError() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double maxTerrainGroundError() const /Deprecated/; %Docstring Returns maximum ground error of terrain tiles in world units. This parameter influences how many zoom levels there will be (together with :py:func:`~Qgs3DMapSettings.mapTileResolution`). @@ -317,7 +317,7 @@ to further split terrain tiles into finer ones because they will not add extra d Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setTerrainElevationOffset( double offset ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setTerrainElevationOffset( double offset ) /Deprecated/; %Docstring Sets the terrain elevation offset (used to move the terrain up or down) @@ -328,7 +328,7 @@ Sets the terrain elevation offset (used to move the terrain up or down) Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double terrainElevationOffset() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double terrainElevationOffset() const /Deprecated/; %Docstring Returns the elevation offset of the terrain (used to move the terrain up or down) @@ -837,7 +837,7 @@ Emitted when the terrain settings are changed. .. versionadded:: 3.42 %End - void terrainVerticalScaleChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void terrainVerticalScaleChanged() /Deprecated/; %Docstring Emitted when the vertical scale of the terrain has changed @@ -846,7 +846,7 @@ Emitted when the vertical scale of the terrain has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void mapTileResolutionChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void mapTileResolutionChanged() /Deprecated/; %Docstring Emitted when the map tile resoulution has changed @@ -855,7 +855,7 @@ Emitted when the map tile resoulution has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void maxTerrainScreenErrorChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void maxTerrainScreenErrorChanged() /Deprecated/; %Docstring Emitted when the maximum terrain screen error has changed @@ -864,7 +864,7 @@ Emitted when the maximum terrain screen error has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void maxTerrainGroundErrorChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void maxTerrainGroundErrorChanged() /Deprecated/; %Docstring Emitted when the maximum terrain ground error has changed @@ -873,7 +873,7 @@ Emitted when the maximum terrain ground error has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void terrainElevationOffsetChanged( double newElevation ) /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void terrainElevationOffsetChanged( double newElevation ) /Deprecated/; %Docstring Emitted when the terrain elevation offset is changed diff --git a/python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in b/python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in index 7502ae7903f65..688d567a93b15 100644 --- a/python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in +++ b/python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in @@ -230,7 +230,7 @@ Sets the terrain settings. .. versionadded:: 3.42 %End - void setTerrainVerticalScale( double zScale ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setTerrainVerticalScale( double zScale ) /Deprecated/; %Docstring Sets vertical scale (exaggeration) of terrain (1 = true scale, > 1 = hills get more pronounced) @@ -240,7 +240,7 @@ Sets vertical scale (exaggeration) of terrain Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double terrainVerticalScale() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double terrainVerticalScale() const /Deprecated/; %Docstring Returns vertical scale (exaggeration) of terrain @@ -249,7 +249,7 @@ Returns vertical scale (exaggeration) of terrain Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMapTileResolution( int res ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMapTileResolution( int res ) /Deprecated/; %Docstring Sets resolution (in pixels) of the texture of a terrain tile @@ -260,7 +260,7 @@ Sets resolution (in pixels) of the texture of a terrain tile Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - int mapTileResolution() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + int mapTileResolution() const /Deprecated/; %Docstring Returns resolution (in pixels) of the texture of a terrain tile. This parameter influences how many zoom levels for terrain tiles there will be (together with :py:func:`~Qgs3DMapSettings.maxTerrainGroundError`) @@ -270,7 +270,7 @@ how many zoom levels for terrain tiles there will be (together with :py:func:`~Q Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMaxTerrainScreenError( double error ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMaxTerrainScreenError( double error ) /Deprecated/; %Docstring Sets maximum allowed screen error of terrain tiles in pixels. @@ -281,7 +281,7 @@ Sets maximum allowed screen error of terrain tiles in pixels. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double maxTerrainScreenError() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double maxTerrainScreenError() const /Deprecated/; %Docstring Returns maximum allowed screen error of terrain tiles in pixels. This parameter decides how aggressively less detailed terrain tiles are swapped to more detailed ones as camera gets closer. @@ -294,7 +294,7 @@ be swapped by more detailed tiles with lower error. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setMaxTerrainGroundError( double error ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setMaxTerrainGroundError( double error ) /Deprecated/; %Docstring Sets the maximum ground error of terrain tiles in world units. @@ -305,7 +305,7 @@ Sets the maximum ground error of terrain tiles in world units. Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double maxTerrainGroundError() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double maxTerrainGroundError() const /Deprecated/; %Docstring Returns maximum ground error of terrain tiles in world units. This parameter influences how many zoom levels there will be (together with :py:func:`~Qgs3DMapSettings.mapTileResolution`). @@ -317,7 +317,7 @@ to further split terrain tiles into finer ones because they will not add extra d Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - void setTerrainElevationOffset( double offset ) /Deprecated="Since 3.42. Use terrainSettings() instead."/; + void setTerrainElevationOffset( double offset ) /Deprecated/; %Docstring Sets the terrain elevation offset (used to move the terrain up or down) @@ -328,7 +328,7 @@ Sets the terrain elevation offset (used to move the terrain up or down) Use :py:func:`~Qgs3DMapSettings.terrainSettings` instead. %End - double terrainElevationOffset() const /Deprecated="Since 3.42. Use terrainSettings() instead."/; + double terrainElevationOffset() const /Deprecated/; %Docstring Returns the elevation offset of the terrain (used to move the terrain up or down) @@ -837,7 +837,7 @@ Emitted when the terrain settings are changed. .. versionadded:: 3.42 %End - void terrainVerticalScaleChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void terrainVerticalScaleChanged() /Deprecated/; %Docstring Emitted when the vertical scale of the terrain has changed @@ -846,7 +846,7 @@ Emitted when the vertical scale of the terrain has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void mapTileResolutionChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void mapTileResolutionChanged() /Deprecated/; %Docstring Emitted when the map tile resoulution has changed @@ -855,7 +855,7 @@ Emitted when the map tile resoulution has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void maxTerrainScreenErrorChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void maxTerrainScreenErrorChanged() /Deprecated/; %Docstring Emitted when the maximum terrain screen error has changed @@ -864,7 +864,7 @@ Emitted when the maximum terrain screen error has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void maxTerrainGroundErrorChanged() /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void maxTerrainGroundErrorChanged() /Deprecated/; %Docstring Emitted when the maximum terrain ground error has changed @@ -873,7 +873,7 @@ Emitted when the maximum terrain ground error has changed Use :py:func:`~Qgs3DMapSettings.terrainSettingsChanged` instead. %End - void terrainElevationOffsetChanged( double newElevation ) /Deprecated="Since 3.42. Use terrainSettingsChanged() instead."/; + void terrainElevationOffsetChanged( double newElevation ) /Deprecated/; %Docstring Emitted when the terrain elevation offset is changed