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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,7 +25,6 @@ class QgsLine3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
#include "qgsline3dsymbol.h"
%End
public:
QgsLine3DSymbol();
~QgsLine3DSymbol();
@ -44,7 +43,7 @@ Caller takes ownership of the returned symbol.
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 );

View File

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

View File

@ -50,7 +50,7 @@ Caller takes ownership of the returned symbol.
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 );
@ -196,6 +196,7 @@ Sets transform for individual objects represented by the symbol
Returns how much the billboard should be elevated upwards
%End
private:
QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
};

View File

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

View File

@ -37,7 +37,7 @@ class QgsPolygon3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
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 );

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,7 +25,6 @@ class QgsLine3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
#include "qgsline3dsymbol.h"
%End
public:
QgsLine3DSymbol();
~QgsLine3DSymbol();
@ -44,7 +43,7 @@ Caller takes ownership of the returned symbol.
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 );

View File

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

View File

@ -50,7 +50,7 @@ Caller takes ownership of the returned symbol.
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 );
@ -196,6 +196,7 @@ Sets transform for individual objects represented by the symbol
Returns how much the billboard should be elevated upwards
%End
private:
QgsPoint3DSymbol &operator=( const QgsPoint3DSymbol & );
};

View File

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

View File

@ -37,7 +37,7 @@ class QgsPolygon3DSymbol : QgsAbstract3DSymbol /NoDefaultCtors/
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 );

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,9 +25,7 @@ request handlers chain.
#include "qgsserverapicontext.h"
%End
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
QgsServerApiContext constructor
@ -68,7 +66,7 @@ Sets the project to ``project``
Returns the server interface
%End
const QString matchedPath( ) const;
const QString matchedPath() const;
%Docstring
Returns the initial part of the incoming request URL path that matches the
API root path.
@ -89,7 +87,7 @@ Returns the API root path
Sets context request to ``request``
%End
QString handlerPath( ) const;
QString handlerPath() const;
%Docstring
Returns the handler component of the URL path, i.e. the part of the path that comes
after the API path.

View File

@ -25,7 +25,6 @@ The :py:class:`QgsServerApiUtils` class contains helper functions to handle comm
#include "qgsserverapiutils.h"
%End
public:
static QgsRectangle parseBbox( const QString &bbox );
%Docstring
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
%End
static QList< QgsServerWmsDimensionProperties::WmsDimensionInfo > temporalDimensions( const QgsVectorLayer *layer );
static QList<QgsServerWmsDimensionProperties::WmsDimensionInfo> temporalDimensions( const QgsVectorLayer *layer );
%Docstring
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
Appends MAP query string parameter from current ``requestUrl`` to the given ``path``
%End
};
/************************************************************************
* This file has been generated automatically from *

View File

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

View File

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

View File

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

View File

@ -17,10 +17,8 @@
%End
namespace QgsServerFeatureId
namespace QgsServerFeatureId
{
QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes );
%Docstring
Returns the feature id based on primary keys.
@ -33,7 +31,7 @@ Returns the feature id based on primary keys.
.. versionadded:: 3.4.9
%End
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest &featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest & featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
%Docstring
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
%End
};
/************************************************************************

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -7,7 +7,7 @@
************************************************************************/
class QgsServerStaticHandler: QgsServerOgcApiHandler
class QgsServerStaticHandler : QgsServerOgcApiHandler
{
%Docstring(signature="appended")
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"
%End
public:
QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( "/static/(?<staticFilePath>.*)$" ), const QString &staticPathSuffix = QString( ) );
QgsServerStaticHandler( const QString &pathRegExp = QStringLiteral( "/static/(?<staticFilePath>.*)$" ), const QString &staticPathSuffix = QString() );
%Docstring
Creates QgsServerStaticHandler

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,9 +25,7 @@ request handlers chain.
#include "qgsserverapicontext.h"
%End
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
QgsServerApiContext constructor
@ -68,7 +66,7 @@ Sets the project to ``project``
Returns the server interface
%End
const QString matchedPath( ) const;
const QString matchedPath() const;
%Docstring
Returns the initial part of the incoming request URL path that matches the
API root path.
@ -89,7 +87,7 @@ Returns the API root path
Sets context request to ``request``
%End
QString handlerPath( ) const;
QString handlerPath() const;
%Docstring
Returns the handler component of the URL path, i.e. the part of the path that comes
after the API path.

View File

@ -25,7 +25,6 @@ The :py:class:`QgsServerApiUtils` class contains helper functions to handle comm
#include "qgsserverapiutils.h"
%End
public:
static QgsRectangle parseBbox( const QString &bbox );
%Docstring
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
%End
static QList< QgsServerWmsDimensionProperties::WmsDimensionInfo > temporalDimensions( const QgsVectorLayer *layer );
static QList<QgsServerWmsDimensionProperties::WmsDimensionInfo> temporalDimensions( const QgsVectorLayer *layer );
%Docstring
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
Appends MAP query string parameter from current ``requestUrl`` to the given ``path``
%End
};
/************************************************************************
* This file has been generated automatically from *

View File

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

View File

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

View File

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

View File

@ -17,10 +17,8 @@
%End
namespace QgsServerFeatureId
namespace QgsServerFeatureId
{
QString getServerFid( const QgsFeature &feature, const QgsAttributeList &pkAttributes );
%Docstring
Returns the feature id based on primary keys.
@ -33,7 +31,7 @@ Returns the feature id based on primary keys.
.. versionadded:: 3.4.9
%End
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest &featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
QgsFeatureRequest updateFeatureRequestFromServerFids( QgsFeatureRequest & featureRequest, const QStringList &serverFids, const QgsVectorDataProvider *provider );
%Docstring
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
%End
};
/************************************************************************

View File

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

View File

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

View File

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

View File

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

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