Skip to content

Commit 0f83a5f

Browse files
committedJun 27, 2017
fix windows build
1 parent aeecda3 commit 0f83a5f

File tree

6 files changed

+3
-13
lines changed

6 files changed

+3
-13
lines changed
 

‎python/server/qgsserverprojectparser.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ Returns the layer id under a <legendlayer> tag in the QGIS projectfile
174174
:rtype: list of QDomElement
175175
%End
176176

177-
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
178-
%Docstring
179-
:rtype: list of QPair< str, QgsDatumTransformStore.Entry >
180-
%End
181177

182178
QStringList wfsLayers() const;
183179
%Docstring

‎python/server/qgswmsconfigparser.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ Adds print capabilities to xml document. ParentElem usually is the <Capabilities
203203
virtual void setScaleDenominator( double denom ) = 0;
204204
virtual void addExternalGMLData( const QString &layerName, QDomDocument *gmlDoc ) = 0;
205205

206-
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
207-
%Docstring
208-
:rtype: list of QPair< str, QgsDatumTransformStore.Entry >
209-
%End
210206

211207
virtual int nLayers() const = 0;
212208
%Docstring

‎python/server/qgswmsprojectparser.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ class QgsWmsProjectParser : QgsWmsConfigParser
8383
virtual void setScaleDenominator( double );
8484
virtual void addExternalGMLData( const QString &, QDomDocument * );
8585

86-
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
87-
8886

8987
virtual int layersAndStyles( QStringList &layers, QStringList &styles ) const;
9088

‎src/server/qgsserverprojectparser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class SERVER_EXPORT QgsServerProjectParser
106106

107107
QList<QDomElement> publishedComposerElements() const;
108108

109-
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
109+
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const SIP_SKIP;
110110

111111
QStringList wfsLayers() const;
112112
QStringList wcsLayers() const;

‎src/server/qgswmsconfigparser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class SERVER_EXPORT QgsWmsConfigParser
129129
virtual void setScaleDenominator( double denom ) = 0;
130130
virtual void addExternalGMLData( const QString &layerName, QDomDocument *gmlDoc ) = 0;
131131

132-
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
132+
virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0 SIP_SKIP;
133133

134134
virtual int nLayers() const = 0;
135135

‎src/server/qgswmsprojectparser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class SERVER_EXPORT QgsWmsProjectParser : public QgsWmsConfigParser
7272
void setScaleDenominator( double ) override {}
7373
void addExternalGMLData( const QString &, QDomDocument * ) override {}
7474

75-
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const override;
75+
QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const override SIP_SKIP;
7676

7777
//! 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
7878
int layersAndStyles( QStringList &layers, QStringList &styles ) const override;

0 commit comments

Comments
 (0)
Please sign in to comment.