sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59805 from 3nids/more-clang

Browse Source 
clang-format on 3d and server
This commit is contained in:
Denis Rouzaud 2024-12-11 10:19:05 +01:00 committed by GitHub
commit 17574346e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
466 changed files with 3664 additions and 6163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -17,8 +17,6 @@ repos:
exclude: | exclude: |
(?x)^( (?x)^(
src/core/.*| src/core/.*|
src/3d/.*|
src/server/.*|
tests/code_layout/sipify/sipifyheader.h tests/code_layout/sipify/sipifyheader.h
)$ )$

1
python/3d/auto_generated/lights/qgslightsource.sip.in
View File

@ -24,7 +24,6 @@ Base class for light sources in 3d scenes.
#include "qgslightsource.h" #include "qgslightsource.h"
%End %End
public: public:
virtual ~QgsLightSource(); virtual ~QgsLightSource();
virtual Qgis::LightSourceType type() const = 0; virtual Qgis::LightSourceType type() const = 0;

4
python/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in
View File

@ -12,7 +12,7 @@
enum class QgsMaterialSettingsRenderingTechnique enum class QgsMaterialSettingsRenderingTechnique
{ {
Triangles, Triangles,
Lines, Lines,
InstancedPoints, InstancedPoints,
@ -40,7 +40,6 @@ Context settings for a material.
#include "qgsabstractmaterialsettings.h" #include "qgsabstractmaterialsettings.h"
%End %End
public: public:
bool isSelected() const; bool isSelected() const;
%Docstring %Docstring
Returns ``True`` if the material should represent a selected state. Returns ``True`` if the material should represent a selected state.
@ -113,7 +112,6 @@ Abstract base class for material settings.
} }
%End %End
public: public:
virtual ~QgsAbstractMaterialSettings(); virtual ~QgsAbstractMaterialSettings();
virtual QString type() const = 0; virtual QString type() const = 0;

1
python/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in
View File

@ -28,7 +28,6 @@ with three color components: ambient, diffuse and specular.
#include "qgsgoochmaterialsettings.h" #include "qgsgoochmaterialsettings.h"
%End %End
public: public:
QgsGoochMaterialSettings(); QgsGoochMaterialSettings();
virtual QString type() const; virtual QString type() const;

2
python/3d/auto_generated/materials/qgsmaterialregistry.sip.in
View File

@ -28,7 +28,6 @@ Stores metadata about one 3D material settings class.
#include "qgsmaterialregistry.h" #include "qgsmaterialregistry.h"
%End %End
public: public:
QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() ); QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() );
%Docstring %Docstring
Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``. Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``.
@ -88,7 +87,6 @@ Qgs3D.materialRegistry().
#include "qgsmaterialregistry.h" #include "qgsmaterialregistry.h"
%End %End
public: public:
QgsMaterialRegistry(); QgsMaterialRegistry();
~QgsMaterialRegistry(); ~QgsMaterialRegistry();

1
python/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in
View File

@ -27,7 +27,6 @@ A PBR metal rough shading material used for rendering.
#include "qgsmetalroughmaterialsettings.h" #include "qgsmetalroughmaterialsettings.h"
%End %End
public: public:
QgsMetalRoughMaterialSettings(); QgsMetalRoughMaterialSettings();
virtual QString type() const; virtual QString type() const;

2
python/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in
View File

@ -28,7 +28,6 @@ Null shading material used for rendering models and scenes with native textures.
#include "qgsnullmaterialsettings.h" #include "qgsnullmaterialsettings.h"
%End %End
public: public:
QgsNullMaterialSettings(); QgsNullMaterialSettings();
virtual QString type() const; virtual QString type() const;
@ -51,7 +50,6 @@ Returns a new instance of QgsNullMaterialSettings.
virtual QMap<QString, QString> toExportParameters() const; virtual QMap<QString, QString> toExportParameters() const;
}; };

1
python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
View File

@ -26,7 +26,6 @@ with three color components: ambient, diffuse and specular.
#include "qgsphongmaterialsettings.h" #include "qgsphongmaterialsettings.h"
%End %End
public: public:
QgsPhongMaterialSettings(); QgsPhongMaterialSettings();
virtual QString type() const; virtual QString type() const;

1
python/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in
View File

@ -27,7 +27,6 @@ A phong shading model with diffuse texture map.
#include "qgsphongtexturedmaterialsettings.h" #include "qgsphongtexturedmaterialsettings.h"
%End %End
public: public:
QgsPhongTexturedMaterialSettings(); QgsPhongTexturedMaterialSettings();
virtual QString type() const; virtual QString type() const;

1
python/3d/auto_generated/materials/qgssimplelinematerialsettings.sip.in
View File

@ -28,7 +28,6 @@ Basic shading material used for rendering simple lines as solid line components.
#include "qgssimplelinematerialsettings.h" #include "qgssimplelinematerialsettings.h"
%End %End
public: public:
QgsSimpleLineMaterialSettings(); QgsSimpleLineMaterialSettings();
virtual QString type() const; virtual QString type() const;

7
python/3d/auto_generated/processing/qgs3dalgorithms.sip.in
View File

@ -9,7 +9,7 @@
class Qgs3DAlgorithms: QgsProcessingProvider class Qgs3DAlgorithms : QgsProcessingProvider
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
QGIS 3D processing algorithm provider. QGIS 3D processing algorithm provider.
@ -19,7 +19,6 @@ QGIS 3D processing algorithm provider.
#include "qgs3dalgorithms.h" #include "qgs3dalgorithms.h"
%End %End
public: public:
Qgs3DAlgorithms( QObject *parent = 0 ); Qgs3DAlgorithms( QObject *parent = 0 );
%Docstring %Docstring
Constructor for Qgs3DAlgorithms. Constructor for Qgs3DAlgorithms.
@ -39,14 +38,10 @@ Constructor for Qgs3DAlgorithms.
protected: protected:
virtual void loadAlgorithms(); virtual void loadAlgorithms();
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

1
python/3d/auto_generated/qgs3d.sip.in
View File

@ -24,7 +24,6 @@ related to 3D classes.
%End %End
public: public:
static Qgs3D *instance(); static Qgs3D *instance();
%Docstring %Docstring
Returns a pointer to the singleton instance. Returns a pointer to the singleton instance.

2
python/3d/auto_generated/qgs3dmapcanvas.sip.in
View File

@ -37,7 +37,6 @@ Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window
#include "qgs3dmapcanvas.h" #include "qgs3dmapcanvas.h"
%End %End
public: public:
Qgs3DMapCanvas(); Qgs3DMapCanvas();
~Qgs3DMapCanvas(); ~Qgs3DMapCanvas();
@ -58,7 +57,6 @@ Returns access to the view's camera controller. Returns ``None`` if the scene ha
protected: protected:
virtual void showEvent( QShowEvent *e ); virtual void showEvent( QShowEvent *e );
%Docstring %Docstring

2
python/3d/auto_generated/qgs3dmapscene.sip.in
View File

@ -132,7 +132,7 @@ it may be useful to temporarily disable scene updates.
.. versionadded:: 3.40 .. versionadded:: 3.40
%End %End
static QMap< QString, Qgs3DMapScene * > openScenes() /Deprecated/; static QMap<QString, Qgs3DMapScene *> openScenes() /Deprecated/;
%Docstring %Docstring
Returns a map of 3D map scenes (by name) open in the QGIS application. Returns a map of 3D map scenes (by name) open in the QGIS application.

1
python/3d/auto_generated/qgs3dmapsettings.sip.in
View File

@ -28,7 +28,6 @@ Definition of the world.
#include "qgs3dmapsettings.h" #include "qgs3dmapsettings.h"
%End %End
public: public:
Qgs3DMapSettings(); Qgs3DMapSettings();
Qgs3DMapSettings( const Qgs3DMapSettings &other ); Qgs3DMapSettings( const Qgs3DMapSettings &other );
~Qgs3DMapSettings(); ~Qgs3DMapSettings();

3
python/3d/auto_generated/qgs3dtypes.sip.in
View File

@ -25,7 +25,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
#include "qgs3dtypes.h" #include "qgs3dtypes.h"
%End %End
public: public:
enum CullingMode enum CullingMode
{ {
NoCulling, NoCulling,
@ -41,8 +40,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
Main3DRenderer, Main3DRenderer,
Selected3DRenderer, Selected3DRenderer,
}; };
}; };
/************************************************************************ /************************************************************************

1
python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in
View File

@ -26,7 +26,6 @@ a single tile for the whole layer, for count=3 there will be 16 tiles.
#include "qgsabstractvectorlayer3drenderer.h" #include "qgsabstractvectorlayer3drenderer.h"
%End %End
public: public:
int zoomLevelsCount() const; int zoomLevelsCount() const;
%Docstring %Docstring
Returns number of zoom levels. One zoom level means there will be one tile. Returns number of zoom levels. One zoom level means there will be one tile.

1
python/3d/auto_generated/qgscameracontroller.sip.in
View File

@ -23,7 +23,6 @@ Object that controls camera movement based on user input
#include "qgscameracontroller.h" #include "qgscameracontroller.h"
%End %End
public: public:
~QgsCameraController(); ~QgsCameraController();

1
python/3d/auto_generated/qgscamerapose.sip.in
View File

@ -30,7 +30,6 @@ The pose is defined with the following parameters:
#include "qgscamerapose.h" #include "qgscamerapose.h"
%End %End
public: public:
QgsVector3D centerPoint() const; QgsVector3D centerPoint() const;
%Docstring %Docstring
Returns center point (towards which point the camera is looking) Returns center point (towards which point the camera is looking)

1
python/3d/auto_generated/qgslayoutitem3dmap.sip.in
View File

@ -43,7 +43,6 @@ Implements support of 3D map views in print layouts
} }
%End %End
public: public:
QgsLayoutItem3DMap( QgsLayout *layout /TransferThis/ ); QgsLayoutItem3DMap( QgsLayout *layout /TransferThis/ );
%Docstring %Docstring
Constructor for QgsLayoutItem3DMap, with the specified parent ``layout``. Constructor for QgsLayoutItem3DMap, with the specified parent ``layout``.

1
python/3d/auto_generated/qgsrulebased3drenderer.sip.in
View File

@ -57,7 +57,6 @@ Similar to rule-based 2D renderer and rule-based labeling, it allows specificati
#include "qgsrulebased3drenderer.h" #include "qgsrulebased3drenderer.h"
%End %End
public: public:
typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList; typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList;
typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap; typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;

1
python/3d/auto_generated/qgstiledscenelayer3drenderer.sip.in
View File

@ -11,7 +11,6 @@
class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata
{ {
%Docstring(signature="appended") %Docstring(signature="appended")

3
python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
View File

@ -25,7 +25,6 @@ class QgsLine3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
#include "qgsline3dsymbol.h" #include "qgsline3dsymbol.h"
%End %End
public: public:
QgsLine3DSymbol(); QgsLine3DSymbol();
~QgsLine3DSymbol(); ~QgsLine3DSymbol();
@ -44,7 +43,7 @@ Caller takes ownership of the returned symbol.
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );

1
python/3d/auto_generated/symbols/qgsmesh3dsymbol.sip.in
View File

@ -28,7 +28,6 @@ class QgsMesh3DSymbol : QgsAbstract3DSymbol
#include "qgsmesh3dsymbol.h" #include "qgsmesh3dsymbol.h"
%End %End
public: public:
enum class RenderingStyle enum class RenderingStyle
{ {
SingleColor, SingleColor,

3
python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
View File

@ -50,7 +50,7 @@ Caller takes ownership of the returned symbol.
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );
@ -196,6 +196,7 @@ Sets transform for individual objects represented by the symbol
Returns how much the billboard should be elevated upwards Returns how much the billboard should be elevated upwards
%End %End
private: private:
QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & ); QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
}; };

1
python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in
View File

@ -27,7 +27,6 @@ class QgsPointCloud3DSymbol : QgsAbstract3DSymbol /Abstract/
#include "qgspointcloud3dsymbol.h" #include "qgspointcloud3dsymbol.h"
%End %End
public: public:
enum RenderingStyle enum RenderingStyle
{ {
// Do not render anything // Do not render anything

2
python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
View File

@ -37,7 +37,7 @@ class QgsPolygon3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );

1
python/PyQt6/3d/auto_generated/lights/qgslightsource.sip.in
View File

@ -24,7 +24,6 @@ Base class for light sources in 3d scenes.
#include "qgslightsource.h" #include "qgslightsource.h"
%End %End
public: public:
virtual ~QgsLightSource(); virtual ~QgsLightSource();
virtual Qgis::LightSourceType type() const = 0; virtual Qgis::LightSourceType type() const = 0;

4
python/PyQt6/3d/auto_generated/materials/qgsabstractmaterialsettings.sip.in
View File

@ -12,7 +12,7 @@
enum class QgsMaterialSettingsRenderingTechnique /BaseType=IntEnum/ enum class QgsMaterialSettingsRenderingTechnique /BaseType=IntEnum/
{ {
Triangles, Triangles,
Lines, Lines,
InstancedPoints, InstancedPoints,
@ -40,7 +40,6 @@ Context settings for a material.
#include "qgsabstractmaterialsettings.h" #include "qgsabstractmaterialsettings.h"
%End %End
public: public:
bool isSelected() const; bool isSelected() const;
%Docstring %Docstring
Returns ``True`` if the material should represent a selected state. Returns ``True`` if the material should represent a selected state.
@ -113,7 +112,6 @@ Abstract base class for material settings.
} }
%End %End
public: public:
virtual ~QgsAbstractMaterialSettings(); virtual ~QgsAbstractMaterialSettings();
virtual QString type() const = 0; virtual QString type() const = 0;

1
python/PyQt6/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in
View File

@ -28,7 +28,6 @@ with three color components: ambient, diffuse and specular.
#include "qgsgoochmaterialsettings.h" #include "qgsgoochmaterialsettings.h"
%End %End
public: public:
QgsGoochMaterialSettings(); QgsGoochMaterialSettings();
virtual QString type() const; virtual QString type() const;

2
python/PyQt6/3d/auto_generated/materials/qgsmaterialregistry.sip.in
View File

@ -28,7 +28,6 @@ Stores metadata about one 3D material settings class.
#include "qgsmaterialregistry.h" #include "qgsmaterialregistry.h"
%End %End
public: public:
QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() ); QgsMaterialSettingsAbstractMetadata( const QString &type, const QString &visibleName, const QIcon &icon = QIcon() );
%Docstring %Docstring
Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``. Constructor for QgsMaterialSettingsAbstractMetadata, with the specified ``type`` and ``visibleName``.
@ -88,7 +87,6 @@ Qgs3D.materialRegistry().
#include "qgsmaterialregistry.h" #include "qgsmaterialregistry.h"
%End %End
public: public:
QgsMaterialRegistry(); QgsMaterialRegistry();
~QgsMaterialRegistry(); ~QgsMaterialRegistry();

1
python/PyQt6/3d/auto_generated/materials/qgsmetalroughmaterialsettings.sip.in
View File

@ -27,7 +27,6 @@ A PBR metal rough shading material used for rendering.
#include "qgsmetalroughmaterialsettings.h" #include "qgsmetalroughmaterialsettings.h"
%End %End
public: public:
QgsMetalRoughMaterialSettings(); QgsMetalRoughMaterialSettings();
virtual QString type() const; virtual QString type() const;

2
python/PyQt6/3d/auto_generated/materials/qgsnullmaterialsettings.sip.in
View File

@ -28,7 +28,6 @@ Null shading material used for rendering models and scenes with native textures.
#include "qgsnullmaterialsettings.h" #include "qgsnullmaterialsettings.h"
%End %End
public: public:
QgsNullMaterialSettings(); QgsNullMaterialSettings();
virtual QString type() const; virtual QString type() const;
@ -51,7 +50,6 @@ Returns a new instance of QgsNullMaterialSettings.
virtual QMap<QString, QString> toExportParameters() const; virtual QMap<QString, QString> toExportParameters() const;
}; };

1
python/PyQt6/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
View File

@ -26,7 +26,6 @@ with three color components: ambient, diffuse and specular.
#include "qgsphongmaterialsettings.h" #include "qgsphongmaterialsettings.h"
%End %End
public: public:
QgsPhongMaterialSettings(); QgsPhongMaterialSettings();
virtual QString type() const; virtual QString type() const;

1
python/PyQt6/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in
View File

@ -27,7 +27,6 @@ A phong shading model with diffuse texture map.
#include "qgsphongtexturedmaterialsettings.h" #include "qgsphongtexturedmaterialsettings.h"
%End %End
public: public:
QgsPhongTexturedMaterialSettings(); QgsPhongTexturedMaterialSettings();
virtual QString type() const; virtual QString type() const;

1
python/PyQt6/3d/auto_generated/materials/qgssimplelinematerialsettings.sip.in
View File

@ -28,7 +28,6 @@ Basic shading material used for rendering simple lines as solid line components.
#include "qgssimplelinematerialsettings.h" #include "qgssimplelinematerialsettings.h"
%End %End
public: public:
QgsSimpleLineMaterialSettings(); QgsSimpleLineMaterialSettings();
virtual QString type() const; virtual QString type() const;

7
python/PyQt6/3d/auto_generated/processing/qgs3dalgorithms.sip.in
View File

@ -9,7 +9,7 @@
class Qgs3DAlgorithms: QgsProcessingProvider class Qgs3DAlgorithms : QgsProcessingProvider
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
QGIS 3D processing algorithm provider. QGIS 3D processing algorithm provider.
@ -19,7 +19,6 @@ QGIS 3D processing algorithm provider.
#include "qgs3dalgorithms.h" #include "qgs3dalgorithms.h"
%End %End
public: public:
Qgs3DAlgorithms( QObject *parent = 0 ); Qgs3DAlgorithms( QObject *parent = 0 );
%Docstring %Docstring
Constructor for Qgs3DAlgorithms. Constructor for Qgs3DAlgorithms.
@ -39,14 +38,10 @@ Constructor for Qgs3DAlgorithms.
protected: protected:
virtual void loadAlgorithms(); virtual void loadAlgorithms();
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

1
python/PyQt6/3d/auto_generated/qgs3d.sip.in
View File

@ -24,7 +24,6 @@ related to 3D classes.
%End %End
public: public:
static Qgs3D *instance(); static Qgs3D *instance();
%Docstring %Docstring
Returns a pointer to the singleton instance. Returns a pointer to the singleton instance.

2
python/PyQt6/3d/auto_generated/qgs3dmapcanvas.sip.in
View File

@ -37,7 +37,6 @@ Qgs3DMapCanvas is a convenience wrapper to simplify the creation of a 3D window
#include "qgs3dmapcanvas.h" #include "qgs3dmapcanvas.h"
%End %End
public: public:
Qgs3DMapCanvas(); Qgs3DMapCanvas();
~Qgs3DMapCanvas(); ~Qgs3DMapCanvas();
@ -58,7 +57,6 @@ Returns access to the view's camera controller. Returns ``None`` if the scene ha
protected: protected:
virtual void showEvent( QShowEvent *e ); virtual void showEvent( QShowEvent *e );
%Docstring %Docstring

2
python/PyQt6/3d/auto_generated/qgs3dmapscene.sip.in
View File

@ -132,7 +132,7 @@ it may be useful to temporarily disable scene updates.
.. versionadded:: 3.40 .. versionadded:: 3.40
%End %End
static QMap< QString, Qgs3DMapScene * > openScenes() /Deprecated/; static QMap<QString, Qgs3DMapScene *> openScenes() /Deprecated/;
%Docstring %Docstring
Returns a map of 3D map scenes (by name) open in the QGIS application. Returns a map of 3D map scenes (by name) open in the QGIS application.

1
python/PyQt6/3d/auto_generated/qgs3dmapsettings.sip.in
View File

@ -28,7 +28,6 @@ Definition of the world.
#include "qgs3dmapsettings.h" #include "qgs3dmapsettings.h"
%End %End
public: public:
Qgs3DMapSettings(); Qgs3DMapSettings();
Qgs3DMapSettings( const Qgs3DMapSettings &other ); Qgs3DMapSettings( const Qgs3DMapSettings &other );
~Qgs3DMapSettings(); ~Qgs3DMapSettings();

3
python/PyQt6/3d/auto_generated/qgs3dtypes.sip.in
View File

@ -25,7 +25,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
#include "qgs3dtypes.h" #include "qgs3dtypes.h"
%End %End
public: public:
enum CullingMode /BaseType=IntEnum/ enum CullingMode /BaseType=IntEnum/
{ {
NoCulling, NoCulling,
@ -41,8 +40,6 @@ Defines enumerations and other auxiliary types for QGIS 3D
Main3DRenderer, Main3DRenderer,
Selected3DRenderer, Selected3DRenderer,
}; };
}; };
/************************************************************************ /************************************************************************

1
python/PyQt6/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in
View File

@ -26,7 +26,6 @@ a single tile for the whole layer, for count=3 there will be 16 tiles.
#include "qgsabstractvectorlayer3drenderer.h" #include "qgsabstractvectorlayer3drenderer.h"
%End %End
public: public:
int zoomLevelsCount() const; int zoomLevelsCount() const;
%Docstring %Docstring
Returns number of zoom levels. One zoom level means there will be one tile. Returns number of zoom levels. One zoom level means there will be one tile.

1
python/PyQt6/3d/auto_generated/qgscameracontroller.sip.in
View File

@ -23,7 +23,6 @@ Object that controls camera movement based on user input
#include "qgscameracontroller.h" #include "qgscameracontroller.h"
%End %End
public: public:
~QgsCameraController(); ~QgsCameraController();

1
python/PyQt6/3d/auto_generated/qgscamerapose.sip.in
View File

@ -30,7 +30,6 @@ The pose is defined with the following parameters:
#include "qgscamerapose.h" #include "qgscamerapose.h"
%End %End
public: public:
QgsVector3D centerPoint() const; QgsVector3D centerPoint() const;
%Docstring %Docstring
Returns center point (towards which point the camera is looking) Returns center point (towards which point the camera is looking)

1
python/PyQt6/3d/auto_generated/qgslayoutitem3dmap.sip.in
View File

@ -43,7 +43,6 @@ Implements support of 3D map views in print layouts
} }
%End %End
public: public:
QgsLayoutItem3DMap( QgsLayout *layout /TransferThis/ ); QgsLayoutItem3DMap( QgsLayout *layout /TransferThis/ );
%Docstring %Docstring
Constructor for QgsLayoutItem3DMap, with the specified parent ``layout``. Constructor for QgsLayoutItem3DMap, with the specified parent ``layout``.

1
python/PyQt6/3d/auto_generated/qgsrulebased3drenderer.sip.in
View File

@ -57,7 +57,6 @@ Similar to rule-based 2D renderer and rule-based labeling, it allows specificati
#include "qgsrulebased3drenderer.h" #include "qgsrulebased3drenderer.h"
%End %End
public: public:
typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList; typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList;
typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap; typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;

1
python/PyQt6/3d/auto_generated/qgstiledscenelayer3drenderer.sip.in
View File

@ -11,7 +11,6 @@
class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata class QgsTiledSceneLayer3DRendererMetadata : Qgs3DRendererAbstractMetadata
{ {
%Docstring(signature="appended") %Docstring(signature="appended")

3
python/PyQt6/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
View File

@ -25,7 +25,6 @@ class QgsLine3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
#include "qgsline3dsymbol.h" #include "qgsline3dsymbol.h"
%End %End
public: public:
QgsLine3DSymbol(); QgsLine3DSymbol();
~QgsLine3DSymbol(); ~QgsLine3DSymbol();
@ -44,7 +43,7 @@ Caller takes ownership of the returned symbol.
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );

1
python/PyQt6/3d/auto_generated/symbols/qgsmesh3dsymbol.sip.in
View File

@ -28,7 +28,6 @@ class QgsMesh3DSymbol : QgsAbstract3DSymbol
#include "qgsmesh3dsymbol.h" #include "qgsmesh3dsymbol.h"
%End %End
public: public:
enum class RenderingStyle /BaseType=IntEnum/ enum class RenderingStyle /BaseType=IntEnum/
{ {
SingleColor, SingleColor,

3
python/PyQt6/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
View File

@ -50,7 +50,7 @@ Caller takes ownership of the returned symbol.
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );
@ -196,6 +196,7 @@ Sets transform for individual objects represented by the symbol
Returns how much the billboard should be elevated upwards Returns how much the billboard should be elevated upwards
%End %End
private: private:
QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & ); QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
}; };

1
python/PyQt6/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in
View File

@ -27,7 +27,6 @@ class QgsPointCloud3DSymbol : QgsAbstract3DSymbol /Abstract/
#include "qgspointcloud3dsymbol.h" #include "qgspointcloud3dsymbol.h"
%End %End
public: public:
enum RenderingStyle /BaseType=IntEnum/ enum RenderingStyle /BaseType=IntEnum/
{ {
// Do not render anything // Do not render anything

2
python/PyQt6/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
View File

@ -37,7 +37,7 @@ class QgsPolygon3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ); virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
virtual QList< Qgis::GeometryType > compatibleGeometryTypes() const; virtual QList<Qgis::GeometryType> compatibleGeometryTypes() const;
virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer ); virtual void setDefaultPropertiesFromLayer( const QgsVectorLayer *layer );

9
python/PyQt6/server/auto_generated/qgsaccesscontrolfilter.sip.in
View File

@ -31,7 +31,6 @@ Security can define any (or none) of the following method:
#include "qgsaccesscontrolfilter.h" #include "qgsaccesscontrolfilter.h"
%End %End
public: public:
QgsAccessControlFilter( const QgsServerInterface *serverInterface ); QgsAccessControlFilter( const QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -43,10 +42,10 @@ and must be passed to QgsAccessControlFilter instances.
struct LayerPermissions struct LayerPermissions
{ {
bool canRead; bool canRead;
bool canUpdate; bool canUpdate;
bool canInsert; bool canInsert;
bool canDelete; bool canDelete;
}; };
const QgsServerInterface *serverInterface() const; const QgsServerInterface *serverInterface() const;

1
python/PyQt6/server/auto_generated/qgsbufferserverrequest.sip.in
View File

@ -18,7 +18,6 @@ Class defining request with data
#include "qgsbufferserverrequest.h" #include "qgsbufferserverrequest.h"
%End %End
public: public:
QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 ); QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 );
%Docstring %Docstring
Constructor Constructor

5
python/PyQt6/server/auto_generated/qgsbufferserverresponse.sip.in
View File

@ -9,7 +9,7 @@
class QgsBufferServerResponse: QgsServerResponse class QgsBufferServerResponse : QgsServerResponse
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
Class defining buffered response Class defining buffered response
@ -19,7 +19,6 @@ Class defining buffered response
#include "qgsbufferserverresponse.h" #include "qgsbufferserverresponse.h"
%End %End
public: public:
QgsBufferServerResponse(); QgsBufferServerResponse();
virtual void setHeader( const QString &key, const QString &value ); virtual void setHeader( const QString &key, const QString &value );
@ -67,7 +66,7 @@ Set the http status code
Returns the http status code Returns the http status code
%End %End
virtual void sendError( int code, const QString &message ); virtual void sendError( int code, const QString &message );
%Docstring %Docstring
Send error Send error

2
python/PyQt6/server/auto_generated/qgsconfigcache.sip.in
View File

@ -22,7 +22,6 @@ Cache for server configuration.
#include "qgsconfigcache.h" #include "qgsconfigcache.h"
%End %End
public: public:
static void initialize( QgsServerSettings *settings ); static void initialize( QgsServerSettings *settings );
%Docstring %Docstring
Initialize from settings. Initialize from settings.
@ -103,7 +102,6 @@ Remove all changed cache entries
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

2
python/PyQt6/server/auto_generated/qgsfcgiserverrequest.sip.in
View File

@ -10,7 +10,7 @@
class QgsFcgiServerRequest: QgsServerRequest class QgsFcgiServerRequest : QgsServerRequest
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
Class defining fcgi request Class defining fcgi request

1
python/PyQt6/server/auto_generated/qgsrequesthandler.sip.in
View File

@ -22,7 +22,6 @@ output from/to a wms request mechanism.
#include "qgsrequesthandler.h" #include "qgsrequesthandler.h"
%End %End
public: public:
explicit QgsRequestHandler( QgsServerRequest &request, QgsServerResponse &response ); explicit QgsRequestHandler( QgsServerRequest &request, QgsServerResponse &response );
%Docstring %Docstring
Constructor Constructor

3
python/PyQt6/server/auto_generated/qgsserver.sip.in
View File

@ -21,7 +21,6 @@ The :py:class:`QgsServer` class provides OGC web services.
#include "qgsserver.h" #include "qgsserver.h"
%End %End
public: public:
QgsServer(); QgsServer();
%Docstring %Docstring
Creates the server instance Creates the server instance
@ -50,7 +49,7 @@ variable
%End %End
QgsServerInterface *serverInterface(); QgsServerInterface * serverInterface();
%Docstring %Docstring
Returns a pointer to the server interface Returns a pointer to the server interface
%End %End

4
python/PyQt6/server/auto_generated/qgsserverapi.sip.in
View File

@ -11,7 +11,6 @@
class QgsServerApi class QgsServerApi
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
@ -62,7 +61,6 @@ of the API will be invoked.
#include "qgsserverapi.h" #include "qgsserverapi.h"
%End %End
public: public:
QgsServerApi( QgsServerInterface *serverIface ); QgsServerApi( QgsServerInterface *serverIface );
%Docstring %Docstring
Creates a QgsServerApi object Creates a QgsServerApi object
@ -112,8 +110,6 @@ Returns the server interface
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

8
python/PyQt6/server/auto_generated/qgsserverapicontext.sip.in
View File

@ -25,9 +25,7 @@ request handlers chain.
#include "qgsserverapicontext.h" #include "qgsserverapicontext.h"
%End %End
public: public:
QgsServerApiContext( const QString &apiRootPath, const QgsServerRequest *request, QgsServerResponse *response, const QgsProject *project, QgsServerInterface *serverInterface );
QgsServerApiContext( const QString &apiRootPath, const QgsServerRequest *request, QgsServerResponse *response,
const QgsProject *project, QgsServerInterface *serverInterface );
%Docstring %Docstring
QgsServerApiContext constructor QgsServerApiContext constructor
@ -68,7 +66,7 @@ Sets the project to ``project``
Returns the server interface Returns the server interface
%End %End
const QString matchedPath( ) const; const QString matchedPath() const;
%Docstring %Docstring
Returns the initial part of the incoming request URL path that matches the Returns the initial part of the incoming request URL path that matches the
API root path. API root path.
@ -89,7 +87,7 @@ Returns the API root path
Sets context request to ``request`` Sets context request to ``request``
%End %End
QString handlerPath( ) const; QString handlerPath() const;
%Docstring %Docstring
Returns the handler component of the URL path, i.e. the part of the path that comes Returns the handler component of the URL path, i.e. the part of the path that comes
after the API path. after the API path.

4
python/PyQt6/server/auto_generated/qgsserverapiutils.sip.in
View File

@ -25,7 +25,6 @@ The :py:class:`QgsServerApiUtils` class contains helper functions to handle comm
#include "qgsserverapiutils.h" #include "qgsserverapiutils.h"
%End %End
public: public:
static QgsRectangle parseBbox( const QString &bbox ); static QgsRectangle parseBbox( const QString &bbox );
%Docstring %Docstring
Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangle`. Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangle`.
@ -35,7 +34,7 @@ Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangl
Z values (i.e. a 6 elements bbox) are silently discarded Z values (i.e. a 6 elements bbox) are silently discarded
%End %End
static QList< QgsServerWmsDimensionProperties::WmsDimensionInfo > temporalDimensions( const QgsVectorLayer *layer ); static QList<QgsServerWmsDimensionProperties::WmsDimensionInfo> temporalDimensions( const QgsVectorLayer *layer );
%Docstring %Docstring
Returns a list of temporal dimensions information for the given ``layer`` (either configured in wmsDimensions or the first date/datetime field) Returns a list of temporal dimensions information for the given ``layer`` (either configured in wmsDimensions or the first date/datetime field)
@ -151,7 +150,6 @@ Returns an empty string on failure.
%Docstring %Docstring
Appends MAP query string parameter from current ``requestUrl`` to the given ``path`` Appends MAP query string parameter from current ``requestUrl`` to the given ``path``
%End %End
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *

2
python/PyQt6/server/auto_generated/qgsservercachefilter.sip.in
View File

@ -25,7 +25,6 @@ Class defining cache interface for QGIS Server plugins.
#include "qgsservercachefilter.h" #include "qgsservercachefilter.h"
%End %End
public: public:
QgsServerCacheFilter( const QgsServerInterface *serverInterface ); QgsServerCacheFilter( const QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -120,7 +119,6 @@ Deletes all cached images for a QGIS project
:return: ``True`` if the images have been deleted :return: ``True`` if the images have been deleted
%End %End
}; };
typedef QMultiMap<int, QgsServerCacheFilter *> QgsServerCacheFilterMap; typedef QMultiMap<int, QgsServerCacheFilter *> QgsServerCacheFilterMap;

1
python/PyQt6/server/auto_generated/qgsservercachemanager.sip.in
View File

@ -22,6 +22,7 @@ A helper class that centralizes caches accesses given by all the server cache fi
%TypeHeaderCode %TypeHeaderCode
#include "qgsservercachemanager.h" #include "qgsservercachemanager.h"
#include "qgsservercachefilter.h"
%End %End
public: public:
QgsServerCacheManager( const QgsServerSettings &settings = QgsServerSettings() ); QgsServerCacheManager( const QgsServerSettings &settings = QgsServerSettings() );

5
python/PyQt6/server/auto_generated/qgsserverexception.sip.in
View File

@ -60,8 +60,7 @@ not appropriate in some situations.
#include "qgsserverexception.h" #include "qgsserverexception.h"
%End %End
public: public:
QgsOgcServiceException( const QString &code, const QString &message, const QString &locator = QString(), QgsOgcServiceException( const QString &code, const QString &message, const QString &locator = QString(), int responseCode = 200, const QString &version = QStringLiteral( "1.3.0" ) );
int responseCode = 200, const QString &version = QStringLiteral( "1.3.0" ) );
%Docstring %Docstring
Construction Construction
%End %End
@ -71,7 +70,7 @@ Construction
Returns the exception message Returns the exception message
%End %End
QString code() const; QString code() const;
%Docstring %Docstring
Returns the exception code Returns the exception code
%End %End

7
python/PyQt6/server/auto_generated/qgsserverfeatureid.sip.in
View File

@ -17,10 +17,8 @@
%End %End
namespace QgsServerFeatureId
namespace QgsServerFeatureId
{ {
QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes ); QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes );
%Docstring %Docstring
Returns the feature id based on primary keys. Returns the feature id based on primary keys.
@ -33,7 +31,7 @@ Returns the feature id based on primary keys.
.. versionadded:: 3.4.9 .. versionadded:: 3.4.9
%End %End
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest &featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider ); QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest & featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
%Docstring %Docstring
Returns the feature request based on feature ids build with primary keys. Returns the feature request based on feature ids build with primary keys.
@ -66,7 +64,6 @@ Returns the primary keys separator
.. versionadded:: 3.4.9 .. versionadded:: 3.4.9
%End %End
}; };
/************************************************************************ /************************************************************************

2
python/PyQt6/server/auto_generated/qgsserverfilter.sip.in
View File

@ -29,7 +29,6 @@ Filters can define any (or none) of the following hooks:
#include "qgsserverfilter.h" #include "qgsserverfilter.h"
%End %End
public: public:
QgsServerFilter( QgsServerInterface *serverInterface ); QgsServerFilter( QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -134,7 +133,6 @@ is called once for each feature before hitting :py:func:`~QgsServerFilter.respon
%End %End
}; };
typedef QMultiMap<int, QgsServerFilter *> QgsServerFiltersMap; typedef QMultiMap<int, QgsServerFilter *> QgsServerFiltersMap;

1
python/PyQt6/server/auto_generated/qgsserverinterface.sip.in
View File

@ -31,7 +31,6 @@ a certain priority through the :py:func:`~registerFilter` method.
%End %End
public: public:
virtual ~QgsServerInterface(); virtual ~QgsServerInterface();

1
python/PyQt6/server/auto_generated/qgsserverlogger.sip.in
View File

@ -21,7 +21,6 @@ Writes message log into server logfile
#include "qgsserverlogger.h" #include "qgsserverlogger.h"
%End %End
public: public:
static QgsServerLogger *instance(); static QgsServerLogger *instance();
%Docstring %Docstring
Gets the singleton instance Gets the singleton instance

7
python/PyQt6/server/auto_generated/qgsserverogcapi.sip.in
View File

@ -39,7 +39,6 @@ as instances of :py:class:`QgsServerOgcApiHandler`.
static const QMetaObject staticMetaObject; static const QMetaObject staticMetaObject;
public: public:
enum Rel /BaseType=IntEnum/ enum Rel /BaseType=IntEnum/
{ {
// The following registered link relation types are used // The following registered link relation types are used
@ -68,11 +67,7 @@ as instances of :py:class:`QgsServerOgcApiHandler`.
XML XML
}; };
QgsServerOgcApi( QgsServerInterface *serverIface, QgsServerOgcApi( QgsServerInterface *serverIface, const QString &rootPath, const QString &name, const QString &description = QString(), const QString &version = QString() );
const QString &rootPath,
const QString &name,
const QString &description = QString(),
const QString &version = QString() );
%Docstring %Docstring
QgsServerOgcApi constructor QgsServerOgcApi constructor

2
python/PyQt6/server/auto_generated/qgsserverogcapihandler.sip.in
View File

@ -74,7 +74,6 @@ Optionally, override:
#include "qgsserverogcapihandler.h" #include "qgsserverogcapihandler.h"
%End %End
public: public:
virtual ~QgsServerOgcApiHandler(); virtual ~QgsServerOgcApiHandler();
@ -254,7 +253,6 @@ Returns a vector layer from the ``collectionId`` in the given ``context``.
protected: protected:
void setContentTypesInt( const QList<int> &contentTypes ) /PyName=setContentTypes/; void setContentTypesInt( const QList<int> &contentTypes ) /PyName=setContentTypes/;
%Docstring %Docstring
Set the content types to ``contentTypes`` Set the content types to ``contentTypes``

17
python/PyQt6/server/auto_generated/qgsserverparameters.sip.in
View File

@ -21,9 +21,7 @@ Definition of a parameter with basic conversion methods
#include "qgsserverparameters.h" #include "qgsserverparameters.h"
%End %End
public: public:
QgsServerParameterDefinition( const QMetaType::Type type = QMetaType::Type::QString, const QVariant defaultValue = QVariant( "" ) );
QgsServerParameterDefinition( const QMetaType::Type type = QMetaType::Type::QString,
const QVariant defaultValue = QVariant( "" ) );
%Docstring %Docstring
Constructor for QgsServerParameterDefinition. Constructor for QgsServerParameterDefinition.
@ -32,8 +30,7 @@ Constructor for QgsServerParameterDefinition.
%End %End
QgsServerParameterDefinition( const QVariant::Type type, QgsServerParameterDefinition( const QVariant::Type type, const QVariant defaultValue = QVariant( "" ) ) /Deprecated/;
const QVariant defaultValue = QVariant( "" ) ) /Deprecated/;
%Docstring %Docstring
Constructor for QgsServerParameterDefinition. Constructor for QgsServerParameterDefinition.
@ -235,9 +232,7 @@ Parameter common to all services (WMS, WFS, ...)
FILE_NAME FILE_NAME
}; };
QgsServerParameter( const QgsServerParameter::Name name = QgsServerParameter::UNKNOWN, QgsServerParameter( const QgsServerParameter::Name name = QgsServerParameter::UNKNOWN, const QMetaType::Type type = QMetaType::Type::QString, const QVariant defaultValue = QVariant( "" ) );
const QMetaType::Type type = QMetaType::Type::QString,
const QVariant defaultValue = QVariant( "" ) );
%Docstring %Docstring
Constructor for QgsServerParameter. Constructor for QgsServerParameter.
@ -246,9 +241,7 @@ Constructor for QgsServerParameter.
:param defaultValue: The default value to use if not defined :param defaultValue: The default value to use if not defined
%End %End
QgsServerParameter( const QgsServerParameter::Name name, QgsServerParameter( const QgsServerParameter::Name name, const QVariant::Type type, const QVariant defaultValue = QVariant( "" ) ) /Deprecated/;
const QVariant::Type type,
const QVariant defaultValue = QVariant( "" ) ) /Deprecated/;
%Docstring %Docstring
Constructor for QgsServerParameter. Constructor for QgsServerParameter.
@ -297,7 +290,6 @@ class QgsServerParameters
static const QMetaObject staticMetaObject; static const QMetaObject staticMetaObject;
public: public:
QgsServerParameters(); QgsServerParameters();
%Docstring %Docstring
Constructor. Constructor.
@ -404,7 +396,6 @@ defined.
%End %End
protected: protected:
virtual bool loadParameter( const QString &name, const QString &value ); virtual bool loadParameter( const QString &name, const QString &value );
%Docstring %Docstring
Loads a parameter with a specific value. This method should be Loads a parameter with a specific value. This method should be

3
python/PyQt6/server/auto_generated/qgsserverprojectutils.sip.in
View File

@ -16,11 +16,10 @@
%End %End
namespace QgsServerProjectUtils namespace QgsServerProjectUtils
{ {
bool owsServiceCapabilities( const QgsProject &project ); bool owsServiceCapabilities( const QgsProject &project );
%Docstring %Docstring
Returns if owsService capabilities are enabled. Returns if owsService capabilities are enabled.

7
python/PyQt6/server/auto_generated/qgsserverquerystringparameter.sip.in
View File

@ -32,7 +32,6 @@ subclassing and overriding the :py:func:`~value` method.
static const QMetaObject staticMetaObject; static const QMetaObject staticMetaObject;
public: public:
enum class Type enum class Type
{ {
String, String,
@ -43,11 +42,7 @@ subclassing and overriding the :py:func:`~value` method.
}; };
QgsServerQueryStringParameter( const QString name, QgsServerQueryStringParameter( const QString name, bool required = false, Type type = QgsServerQueryStringParameter::Type::String, const QString &description = QString(), const QVariant &defaultValue = QVariant() );
bool required = false,
Type type = QgsServerQueryStringParameter::Type::String,
const QString &description = QString(),
const QVariant &defaultValue = QVariant() );
%Docstring %Docstring
Constructs a QgsServerQueryStringParameter object. Constructs a QgsServerQueryStringParameter object.

4
python/PyQt6/server/auto_generated/qgsserverrequest.sip.in
View File

@ -23,7 +23,6 @@ Class defining request interface passed to services :py:func:`QgsService.execute
static const QMetaObject staticMetaObject; static const QMetaObject staticMetaObject;
public: public:
typedef QMap<QString, QString> Parameters; typedef QMap<QString, QString> Parameters;
typedef QMap<QString, QString> Headers; typedef QMap<QString, QString> Headers;
@ -206,7 +205,7 @@ the base URL will be ``http://example.com/folder``
Set the request method Set the request method
%End %End
const QString queryParameter( const QString &name, const QString &defaultValue = QString( ) ) const; const QString queryParameter( const QString &name, const QString &defaultValue = QString() ) const;
%Docstring %Docstring
Returns the query string parameter with the given ``name`` from the request URL, a ``defaultValue`` can be specified. Returns the query string parameter with the given ``name`` from the request URL, a ``defaultValue`` can be specified.
@ -214,7 +213,6 @@ Returns the query string parameter with the given ``name`` from the request URL,
%End %End
protected: protected:
void setOriginalUrl( const QUrl &url ); void setOriginalUrl( const QUrl &url );
%Docstring %Docstring
Set the request original ``url`` (the request url as seen by the web server) Set the request original ``url`` (the request url as seen by the web server)

3
python/PyQt6/server/auto_generated/qgsserverresponse.sip.in
View File

@ -19,7 +19,6 @@ class QgsServerResponse
#include "qgsserverresponse.h" #include "qgsserverresponse.h"
%End %End
public: public:
QgsServerResponse(); QgsServerResponse();
virtual ~QgsServerResponse(); virtual ~QgsServerResponse();
@ -64,7 +63,7 @@ Set the http status code
Returns the http status code Returns the http status code
%End %End
virtual void sendError( int code, const QString &message ) = 0; virtual void sendError( int code, const QString &message ) = 0;
%Docstring %Docstring
Send error Send error
This method delegates error handling at the server level. This is different This method delegates error handling at the server level. This is different

5
python/PyQt6/server/auto_generated/qgsserverstatichandler.sip.in
View File

@ -7,7 +7,7 @@
************************************************************************/ ************************************************************************/
class QgsServerStaticHandler: QgsServerOgcApiHandler class QgsServerStaticHandler : QgsServerOgcApiHandler
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
The :py:class:`QgsServerStaticHandler` class serves static files from the static path (resources/server/api/wfs3/static) The :py:class:`QgsServerStaticHandler` class serves static files from the static path (resources/server/api/wfs3/static)
@ -21,8 +21,7 @@ The :py:class:`QgsServerStaticHandler` class serves static files from the static
#include "qgsserverstatichandler.h" #include "qgsserverstatichandler.h"
%End %End
public: public:
QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( "/static/(?<staticFilePath>.*)$" ), const QString &staticPathSuffix = QString() );
QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( "/static/(?<staticFilePath>.*)$" ), const QString &staticPathSuffix = QString( ) );
%Docstring %Docstring
Creates QgsServerStaticHandler Creates QgsServerStaticHandler

6
python/PyQt6/server/auto_generated/qgsservice.sip.in
View File

@ -27,7 +27,6 @@ They are registered at runtime for a given service name.
#include "qgsserverresponse.h" #include "qgsserverresponse.h"
%End %End
public: public:
QgsService(); QgsService();
virtual ~QgsService(); virtual ~QgsService();
@ -43,15 +42,12 @@ They are registered at runtime for a given service name.
:return: the version of the service :return: the version of the service
%End %End
virtual void executeRequest( const QgsServerRequest &request, virtual void executeRequest( const QgsServerRequest &request, QgsServerResponse &response, const QgsProject *project ) = 0;
QgsServerResponse &response,
const QgsProject *project ) = 0;
%Docstring %Docstring
Execute the requests and set result in :py:class:`QgsServerRequest` Execute the requests and set result in :py:class:`QgsServerRequest`
%End %End
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

4
python/PyQt6/server/auto_generated/qgsservicemodule.sip.in
View File

@ -26,12 +26,10 @@ QGS_ServiceModule_Init() entry point.
#include "qgsservicemodule.h" #include "qgsservicemodule.h"
%End %End
public: public:
QgsServiceModule(); QgsServiceModule();
virtual ~QgsServiceModule(); virtual ~QgsServiceModule();
virtual void registerSelf( QgsServiceRegistry &registry, virtual void registerSelf( QgsServiceRegistry &registry, QgsServerInterface *serverIface = 0 ) = 0;
QgsServerInterface *serverIface = 0 ) = 0;
%Docstring %Docstring
Asks the module to register all provided services. Asks the module to register all provided services.

2
python/PyQt6/server/auto_generated/qgsserviceregistry.sip.in
View File

@ -28,7 +28,6 @@ will call 'delete' on cleanup
#include "qgsserviceregistry.h" #include "qgsserviceregistry.h"
%End %End
public: public:
QgsServiceRegistry(); QgsServiceRegistry();
~QgsServiceRegistry(); ~QgsServiceRegistry();
@ -123,7 +122,6 @@ Clean up registered service and unregister modules
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

3
python/PyQt6/server/auto_generated/qgsstorebadlayerinfo.sip.in
View File

@ -9,7 +9,7 @@
class QgsStoreBadLayerInfo: QgsProjectBadLayerHandler class QgsStoreBadLayerInfo : QgsProjectBadLayerHandler
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
Stores layer ids of bad layers Stores layer ids of bad layers
@ -21,7 +21,6 @@ Stores layer ids of bad layers
#include "qgsstorebadlayerinfo.h" #include "qgsstorebadlayerinfo.h"
%End %End
public: public:
QgsStoreBadLayerInfo(); QgsStoreBadLayerInfo();
%Docstring %Docstring
Default constructor Default constructor

9
python/server/auto_generated/qgsaccesscontrolfilter.sip.in
View File

@ -31,7 +31,6 @@ Security can define any (or none) of the following method:
#include "qgsaccesscontrolfilter.h" #include "qgsaccesscontrolfilter.h"
%End %End
public: public:
QgsAccessControlFilter( const QgsServerInterface *serverInterface ); QgsAccessControlFilter( const QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -43,10 +42,10 @@ and must be passed to QgsAccessControlFilter instances.
struct LayerPermissions struct LayerPermissions
{ {
bool canRead; bool canRead;
bool canUpdate; bool canUpdate;
bool canInsert; bool canInsert;
bool canDelete; bool canDelete;
}; };
const QgsServerInterface *serverInterface() const; const QgsServerInterface *serverInterface() const;

1
python/server/auto_generated/qgsbufferserverrequest.sip.in
View File

@ -18,7 +18,6 @@ Class defining request with data
#include "qgsbufferserverrequest.h" #include "qgsbufferserverrequest.h"
%End %End
public: public:
QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 ); QgsBufferServerRequest( const QString &url, QgsServerRequest::Method method = QgsServerRequest::GetMethod, const QgsServerRequest::Headers &headers = QgsServerRequest::Headers(), QByteArray *data = 0 );
%Docstring %Docstring
Constructor Constructor

5
python/server/auto_generated/qgsbufferserverresponse.sip.in
View File

@ -9,7 +9,7 @@
class QgsBufferServerResponse: QgsServerResponse class QgsBufferServerResponse : QgsServerResponse
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
Class defining buffered response Class defining buffered response
@ -19,7 +19,6 @@ Class defining buffered response
#include "qgsbufferserverresponse.h" #include "qgsbufferserverresponse.h"
%End %End
public: public:
QgsBufferServerResponse(); QgsBufferServerResponse();
virtual void setHeader( const QString &key, const QString &value ); virtual void setHeader( const QString &key, const QString &value );
@ -67,7 +66,7 @@ Set the http status code
Returns the http status code Returns the http status code
%End %End
virtual void sendError( int code, const QString &message ); virtual void sendError( int code, const QString &message );
%Docstring %Docstring
Send error Send error

2
python/server/auto_generated/qgsconfigcache.sip.in
View File

@ -22,7 +22,6 @@ Cache for server configuration.
#include "qgsconfigcache.h" #include "qgsconfigcache.h"
%End %End
public: public:
static void initialize( QgsServerSettings *settings ); static void initialize( QgsServerSettings *settings );
%Docstring %Docstring
Initialize from settings. Initialize from settings.
@ -103,7 +102,6 @@ Remove all changed cache entries
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

2
python/server/auto_generated/qgsfcgiserverrequest.sip.in
View File

@ -10,7 +10,7 @@
class QgsFcgiServerRequest: QgsServerRequest class QgsFcgiServerRequest : QgsServerRequest
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
Class defining fcgi request Class defining fcgi request

1
python/server/auto_generated/qgsrequesthandler.sip.in
View File

@ -22,7 +22,6 @@ output from/to a wms request mechanism.
#include "qgsrequesthandler.h" #include "qgsrequesthandler.h"
%End %End
public: public:
explicit QgsRequestHandler( QgsServerRequest &request, QgsServerResponse &response ); explicit QgsRequestHandler( QgsServerRequest &request, QgsServerResponse &response );
%Docstring %Docstring
Constructor Constructor

3
python/server/auto_generated/qgsserver.sip.in
View File

@ -21,7 +21,6 @@ The :py:class:`QgsServer` class provides OGC web services.
#include "qgsserver.h" #include "qgsserver.h"
%End %End
public: public:
QgsServer(); QgsServer();
%Docstring %Docstring
Creates the server instance Creates the server instance
@ -50,7 +49,7 @@ variable
%End %End
QgsServerInterface *serverInterface(); QgsServerInterface * serverInterface();
%Docstring %Docstring
Returns a pointer to the server interface Returns a pointer to the server interface
%End %End

4
python/server/auto_generated/qgsserverapi.sip.in
View File

@ -11,7 +11,6 @@
class QgsServerApi class QgsServerApi
{ {
%Docstring(signature="appended") %Docstring(signature="appended")
@ -62,7 +61,6 @@ of the API will be invoked.
#include "qgsserverapi.h" #include "qgsserverapi.h"
%End %End
public: public:
QgsServerApi( QgsServerInterface *serverIface ); QgsServerApi( QgsServerInterface *serverIface );
%Docstring %Docstring
Creates a QgsServerApi object Creates a QgsServerApi object
@ -112,8 +110,6 @@ Returns the server interface
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

8
python/server/auto_generated/qgsserverapicontext.sip.in
View File

@ -25,9 +25,7 @@ request handlers chain.
#include "qgsserverapicontext.h" #include "qgsserverapicontext.h"
%End %End
public: public:
QgsServerApiContext( const QString &apiRootPath, const QgsServerRequest *request, QgsServerResponse *response, const QgsProject *project, QgsServerInterface *serverInterface );
QgsServerApiContext( const QString &apiRootPath, const QgsServerRequest *request, QgsServerResponse *response,
const QgsProject *project, QgsServerInterface *serverInterface );
%Docstring %Docstring
QgsServerApiContext constructor QgsServerApiContext constructor
@ -68,7 +66,7 @@ Sets the project to ``project``
Returns the server interface Returns the server interface
%End %End
const QString matchedPath( ) const; const QString matchedPath() const;
%Docstring %Docstring
Returns the initial part of the incoming request URL path that matches the Returns the initial part of the incoming request URL path that matches the
API root path. API root path.
@ -89,7 +87,7 @@ Returns the API root path
Sets context request to ``request`` Sets context request to ``request``
%End %End
QString handlerPath( ) const; QString handlerPath() const;
%Docstring %Docstring
Returns the handler component of the URL path, i.e. the part of the path that comes Returns the handler component of the URL path, i.e. the part of the path that comes
after the API path. after the API path.

4
python/server/auto_generated/qgsserverapiutils.sip.in
View File

@ -25,7 +25,6 @@ The :py:class:`QgsServerApiUtils` class contains helper functions to handle comm
#include "qgsserverapiutils.h" #include "qgsserverapiutils.h"
%End %End
public: public:
static QgsRectangle parseBbox( const QString &bbox ); static QgsRectangle parseBbox( const QString &bbox );
%Docstring %Docstring
Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangle`. Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangle`.
@ -35,7 +34,7 @@ Parses a comma separated ``bbox`` into a (possibly empty) :py:class:`QgsRectangl
Z values (i.e. a 6 elements bbox) are silently discarded Z values (i.e. a 6 elements bbox) are silently discarded
%End %End
static QList< QgsServerWmsDimensionProperties::WmsDimensionInfo > temporalDimensions( const QgsVectorLayer *layer ); static QList<QgsServerWmsDimensionProperties::WmsDimensionInfo> temporalDimensions( const QgsVectorLayer *layer );
%Docstring %Docstring
Returns a list of temporal dimensions information for the given ``layer`` (either configured in wmsDimensions or the first date/datetime field) Returns a list of temporal dimensions information for the given ``layer`` (either configured in wmsDimensions or the first date/datetime field)
@ -151,7 +150,6 @@ Returns an empty string on failure.
%Docstring %Docstring
Appends MAP query string parameter from current ``requestUrl`` to the given ``path`` Appends MAP query string parameter from current ``requestUrl`` to the given ``path``
%End %End
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *

2
python/server/auto_generated/qgsservercachefilter.sip.in
View File

@ -25,7 +25,6 @@ Class defining cache interface for QGIS Server plugins.
#include "qgsservercachefilter.h" #include "qgsservercachefilter.h"
%End %End
public: public:
QgsServerCacheFilter( const QgsServerInterface *serverInterface ); QgsServerCacheFilter( const QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -120,7 +119,6 @@ Deletes all cached images for a QGIS project
:return: ``True`` if the images have been deleted :return: ``True`` if the images have been deleted
%End %End
}; };
typedef QMultiMap<int, QgsServerCacheFilter *> QgsServerCacheFilterMap; typedef QMultiMap<int, QgsServerCacheFilter *> QgsServerCacheFilterMap;

1
python/server/auto_generated/qgsservercachemanager.sip.in
View File

@ -22,6 +22,7 @@ A helper class that centralizes caches accesses given by all the server cache fi
%TypeHeaderCode %TypeHeaderCode
#include "qgsservercachemanager.h" #include "qgsservercachemanager.h"
#include "qgsservercachefilter.h"
%End %End
public: public:
QgsServerCacheManager( const QgsServerSettings &settings = QgsServerSettings() ); QgsServerCacheManager( const QgsServerSettings &settings = QgsServerSettings() );

5
python/server/auto_generated/qgsserverexception.sip.in
View File

@ -60,8 +60,7 @@ not appropriate in some situations.
#include "qgsserverexception.h" #include "qgsserverexception.h"
%End %End
public: public:
QgsOgcServiceException( const QString &code, const QString &message, const QString &locator = QString(), QgsOgcServiceException( const QString &code, const QString &message, const QString &locator = QString(), int responseCode = 200, const QString &version = QStringLiteral( "1.3.0" ) );
int responseCode = 200, const QString &version = QStringLiteral( "1.3.0" ) );
%Docstring %Docstring
Construction Construction
%End %End
@ -71,7 +70,7 @@ Construction
Returns the exception message Returns the exception message
%End %End
QString code() const; QString code() const;
%Docstring %Docstring
Returns the exception code Returns the exception code
%End %End

7
python/server/auto_generated/qgsserverfeatureid.sip.in
View File

@ -17,10 +17,8 @@
%End %End
namespace QgsServerFeatureId
namespace QgsServerFeatureId
{ {
QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes ); QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes );
%Docstring %Docstring
Returns the feature id based on primary keys. Returns the feature id based on primary keys.
@ -33,7 +31,7 @@ Returns the feature id based on primary keys.
.. versionadded:: 3.4.9 .. versionadded:: 3.4.9
%End %End
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest &featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider ); QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest & featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
%Docstring %Docstring
Returns the feature request based on feature ids build with primary keys. Returns the feature request based on feature ids build with primary keys.
@ -66,7 +64,6 @@ Returns the primary keys separator
.. versionadded:: 3.4.9 .. versionadded:: 3.4.9
%End %End
}; };
/************************************************************************ /************************************************************************

2
python/server/auto_generated/qgsserverfilter.sip.in
View File

@ -29,7 +29,6 @@ Filters can define any (or none) of the following hooks:
#include "qgsserverfilter.h" #include "qgsserverfilter.h"
%End %End
public: public:
QgsServerFilter( QgsServerInterface *serverInterface ); QgsServerFilter( QgsServerInterface *serverInterface );
%Docstring %Docstring
Constructor Constructor
@ -134,7 +133,6 @@ is called once for each feature before hitting :py:func:`~QgsServerFilter.respon
%End %End
}; };
typedef QMultiMap<int, QgsServerFilter *> QgsServerFiltersMap; typedef QMultiMap<int, QgsServerFilter *> QgsServerFiltersMap;

1
python/server/auto_generated/qgsserverinterface.sip.in
View File

@ -31,7 +31,6 @@ a certain priority through the :py:func:`~registerFilter` method.
%End %End
public: public:
virtual ~QgsServerInterface(); virtual ~QgsServerInterface();

1
python/server/auto_generated/qgsserverlogger.sip.in
View File

@ -21,7 +21,6 @@ Writes message log into server logfile
#include "qgsserverlogger.h" #include "qgsserverlogger.h"
%End %End
public: public:
static QgsServerLogger *instance(); static QgsServerLogger *instance();
%Docstring %Docstring
Gets the singleton instance Gets the singleton instance

7
python/server/auto_generated/qgsserverogcapi.sip.in
View File

@ -39,7 +39,6 @@ as instances of :py:class:`QgsServerOgcApiHandler`.
static const QMetaObject staticMetaObject; static const QMetaObject staticMetaObject;
public: public:
enum Rel enum Rel
{ {
// The following registered link relation types are used // The following registered link relation types are used
@ -68,11 +67,7 @@ as instances of :py:class:`QgsServerOgcApiHandler`.
XML XML
}; };
QgsServerOgcApi( QgsServerInterface *serverIface, QgsServerOgcApi( QgsServerInterface *serverIface, const QString &rootPath, const QString &name, const QString &description = QString(), const QString &version = QString() );
const QString &rootPath,
const QString &name,
const QString &description = QString(),
const QString &version = QString() );
%Docstring %Docstring
QgsServerOgcApi constructor QgsServerOgcApi constructor

Some files were not shown because too many files have changed in this diff Show More