fix windows build

qgis · Jun 27, 2017 · 0f83a5f · 0f83a5f
1 parent aeecda3
commit 0f83a5f
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git a/python/server/qgsserverprojectparser.sip b/python/server/qgsserverprojectparser.sip
@@ -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

diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip
@@ -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

diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip
@@ -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;
 

diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h
@@ -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;

diff --git a/src/server/qgswmsconfigparser.h b/src/server/qgswmsconfigparser.h
@@ -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;
 

diff --git a/src/server/qgswmsprojectparser.h b/src/server/qgswmsprojectparser.h
@@ -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;