remove QgsMapRenderer

python/core/qgsdatumtransformstore.sip

@@ -33,4 +33,11 @@ class QgsDatumTransformStore
 
     void writeXml( QDomNode& parentNode, QDomDocument& theDoc ) const;
 
+    struct Entry
+    {
+      QString srcAuthId;
+      QString destAuthId;
+      int srcDatumTransform; //-1 if unknown or not specified
+      int destDatumTransform;
+    };
 };

python/core/qgsmaprendererjob.sip

@@ -65,6 +65,18 @@ class QgsMapRendererJob : QObject
     //! Get pointer to internal labeling engine (in order to get access to the results)
     virtual QgsLabelingResults* takeLabelingResults() = 0 /Transfer/;
 
+    //! @note Added in QGIS 3.0
+    //! Set the feature filter provider used by the QgsRenderContext of
+    //! each LayerRenderJob.
+    //! Ownership is not transferred and the provider must not be deleted
+    //! before the render job.
+    void setFeatureFilterProvider( const QgsFeatureFilterProvider *f );
+
+    //! @note Added in QGIS 3.0
+    //! Returns the feature filter provider used by the QgsRenderContext of
+    //! each LayerRenderJob.
+    const QgsFeatureFilterProvider* featureFilterProvider() const;
+
     struct Error
     {
       Error( const QString& lid, const QString& msg );

python/server/qgsserverprojectparser.sip

@@ -86,7 +86,7 @@ class QgsServerProjectParser
 
     QList<QDomElement> publishedComposerElements() const;
 
-    //QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const;
+    //QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const;
 
     /** Returns the text of the <layername> element for a layer element
     @return id or a null string in case of error*/

python/server/qgswfserver.sip

@@ -33,7 +33,6 @@ class QgsComposerLegendItem;
 class QgsComposition;
 class QgsFields;
 class QgsMapLayer;
-class QgsMapRenderer;
 class QgsPoint;
 class QgsRasterLayer;
 class QgsConfigParser;

python/server/qgswmsconfigparser.sip

@@ -45,7 +45,7 @@ class QgsWmsConfigParser
     virtual QDomDocument describeLayer( QStringList& layerList, const QString& hrefString ) const = 0;
 
     /** Returns if output are MM or PIXEL*/
-    virtual QgsMapRenderer::OutputUnits outputUnits() const = 0;
+    virtual QgsUnitTypes::RenderUnit outputUnits() const = 0;
 
     /** Returns an ID-list of layers which are not queryable (comes from <properties> -> <Identify> -> <disabledLayers in the project file*/
     virtual QStringList identifyDisabledLayers() const = 0;
@@ -71,8 +71,8 @@ class QgsWmsConfigParser
     /** Draw text annotation items from the QGIS projectfile*/
     virtual void drawOverlays( QPainter* p, int dpi, int width, int height ) const = 0;
 
-    /** Load PAL engine settings from the QGIS projectfile*/
-    virtual void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const = 0;
+    /** Load PAL engine settings  into global project instance*/
+    virtual void loadLabelSettings() const = 0;
 
     virtual QString serviceUrl() const = 0;
 
@@ -101,21 +101,18 @@ class QgsWmsConfigParser
     //printing
 
     /** Creates a print composition, usually for a GetPrint request. Replaces map and label parameters*/
-    QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const;
-
-   /** Creates a print composition, usually for a GetPrint request. Replaces map and label parameters*/
-    QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const;
+    QgsComposition* createPrintComposition( const QString& composerTemplate, const QgsMapSettings& mapSettings, const QMap< QString, QString >& parameterMap, QStringList& highlightLayers ) const;
 
     /** Creates a composition from the project file (probably delegated to the fallback parser)*/
-    //virtual QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList /Out/, QList< QgsComposerLegend* >& legendList /Out/, QList< QgsComposerLabel* >& labelList /Out/, QList<const QgsComposerHtml *>& htmlFrameList /Out/ ) const = 0;
+    //virtual QgsComposition* initComposition( const QString& composerTemplate, const QgsMapSettings& mapSettings, QList< QgsComposerMap*>& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const = 0;
 
     /** Adds print capabilities to xml document. ParentElem usually is the <Capabilities> element*/
     virtual void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const = 0;
 
     virtual void setScaleDenominator( double denom ) = 0;
     virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0;
 
-    virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
+    virtual QList< QPair< QString, QgsDatumTransformStore::Entry > > layerCoordinateTransforms() const = 0;
 
     virtual int nLayers() const = 0;