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

fix windows build

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-06-27 12:39:30 +02:00
parent aeecda3707
commit 0f83a5f52d
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/server/qgsserverprojectparser.sip
View File

@ -174,10 +174,6 @@ Returns the layer id under a <legendlayer> tag in the QGIS projectfile
:rtype: list of QDomElement
%End
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
%Docstring
:rtype: list of QPair< str, QgsDatumTransformStore.Entry >
%End
QStringList wfsLayers() const;
%Docstring

4
python/server/qgswmsconfigparser.sip
View File

@ -203,10 +203,6 @@ Adds print capabilities to xml document. ParentElem usually is the <Capabilities
virtual void setScaleDenominator( double denom ) = 0;
virtual void addExternalGMLData( const QString &layerName, QDomDocument *gmlDoc ) = 0;
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
%Docstring
:rtype: list of QPair< str, QgsDatumTransformStore.Entry >
%End
virtual int nLayers() const = 0;
%Docstring

2
python/server/qgswmsprojectparser.sip
View File

@ -83,8 +83,6 @@ class QgsWmsProjectParser : QgsWmsConfigParser
virtual void setScaleDenominator( double );
virtual void addExternalGMLData( const QString &, QDomDocument * );
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
virtual int layersAndStyles( QStringList &layers, QStringList &styles ) const;

2
src/server/qgsserverprojectparser.h
View File

@ -106,7 +106,7 @@ class SERVER_EXPORT QgsServerProjectParser
QList<QDomElement> publishedComposerElements() const;
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const SIP_SKIP;
QStringList wfsLayers() const;
QStringList wcsLayers() const;

2
src/server/qgswmsconfigparser.h
View File

@ -129,7 +129,7 @@ class SERVER_EXPORT QgsWmsConfigParser
virtual void setScaleDenominator( double denom ) = 0;
virtual void addExternalGMLData( const QString &layerName, QDomDocument *gmlDoc ) = 0;
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0 SIP_SKIP;
virtual int nLayers() const = 0;

2
src/server/qgswmsprojectparser.h
View File

@ -72,7 +72,7 @@ class SERVER_EXPORT QgsWmsProjectParser : public QgsWmsConfigParser
void setScaleDenominator( double ) override {}
void addExternalGMLData( const QString &, QDomDocument * ) override {}
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const override;
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const override SIP_SKIP;
//! Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success
int layersAndStyles( QStringList &layers, QStringList &styles ) const override;