Merge pull request #4959 from rldhont/server-wms-configparser-getprint

[Server] WMS GetPrint refactoring

Author: rldhont

python/core/qgsvectorlayer.sip

@@ -854,20 +854,21 @@ Return the provider type for this layer
 .. versionadded:: 2.10
 %End
 
-    bool countSymbolFeatures();
+    QgsVectorLayerFeatureCounter *countSymbolFeatures();
 %Docstring
  Count features for symbols.
- The method will return immediately. You will need to connect to the
- symbolFeatureCountMapChanged() signal to be notified when the freshly updated
- feature counts are ready.
+ The method will return the feature counter task. You will need to
+ connect to the symbolFeatureCountMapChanged() signal to be
+ notified when the freshly updated feature counts are ready.
 
 .. note::
 
-   If you need to wait for the results, create and start your own QgsVectorLayerFeatureCounter
-       task and call waitForFinished().
+   If the count features for symbols has been already done a
+       None is returned. If you need to wait for the results,
+       you can call waitForFinished() on the feature counter.
 
 .. versionadded:: 3.0
- :rtype: bool
+ :rtype: QgsVectorLayerFeatureCounter
 %End
 
     virtual bool setSubsetString( const QString &subset );

python/server/qgsconfigcache.sip

@@ -34,17 +34,6 @@ class QgsConfigCache : QObject
  :rtype: QgsConfigCache
 %End
 
-    QgsServerProjectParser *serverConfiguration( const QString &filePath );
-%Docstring
- :rtype: QgsServerProjectParser
-%End
-    QgsWmsConfigParser *wmsConfiguration( const QString &filePath,
-                                          const QgsAccessControl *accessControl,
-                                          const QMap<QString, QString> &parameterMap = QMap< QString, QString >() );
-%Docstring
- :rtype: QgsWmsConfigParser
-%End
-
     void removeEntry( const QString &path );
 
     const QgsProject *project( const QString &path );

python/server/qgsserverprojectparser.sip

@@ -129,6 +129,14 @@ namespace QgsServerProjectUtils
  :rtype: int
 %End
 
+  int wmsImageQuality( const QgsProject &project );
+%Docstring
+ Returns the quality for WMS images defined in a QGIS project.
+ \param project the QGIS project
+ :return: quality if defined in project, -1 otherwise.
+ :rtype: int
+%End
+
   bool wmsUseLayerIds( const QgsProject &project );
 %Docstring
  Returns if layer ids are used as name in WMS.