From 516bdfeed9e7bc411e22edd3cba5a19a421e1eed Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 9 Feb 2017 17:00:40 +1000
Subject: [PATCH] Fix build

---
 python/gui/gui.sip                            |  1 -
 .../gui/symbology-ng/qgssizescalewidget.sip   | 20 -------------------
 .../qgscategorizedsymbolrenderer.cpp          |  2 +-
 .../qgsgraduatedsymbolrenderer.cpp            |  2 +-
 .../symbology-ng/qgssinglesymbolrenderer.cpp  |  6 +++---
 5 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 python/gui/symbology-ng/qgssizescalewidget.sip

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
index dbbee19ee94..c105a1bc6a3 100644
--- a/python/gui/gui.sip
+++ b/python/gui/gui.sip
@@ -240,7 +240,6 @@
 %Include symbology-ng/qgsrendererwidget.sip
 %Include symbology-ng/qgsrulebasedrendererwidget.sip
 %Include symbology-ng/qgssinglesymbolrendererwidget.sip
-%Include symbology-ng/qgssizescalewidget.sip
 %Include symbology-ng/qgssmartgroupeditordialog.sip
 %Include symbology-ng/qgsstyleexportimportdialog.sip
 %Include symbology-ng/qgsstylegroupselectiondialog.sip
diff --git a/python/gui/symbology-ng/qgssizescalewidget.sip b/python/gui/symbology-ng/qgssizescalewidget.sip
deleted file mode 100644
index 96917bcee2f..00000000000
--- a/python/gui/symbology-ng/qgssizescalewidget.sip
+++ /dev/null
@@ -1,20 +0,0 @@
-class QgsSizeScaleWidget : QgsDataDefinedAssistant
-{
-%TypeHeaderCode
-#include <qgssizescalewidget.h>
-%End
-  public:
-    QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsMarkerSymbol * symbol );
-
-    virtual QgsProperty property() const;
-
-    /** Returns the vector layer associated with the widget.
-     * @note added in QGIS 2.12
-     */
-    const QgsVectorLayer* layer() const;
-
-  protected:
-
-    virtual void showEvent( QShowEvent * );
-};
-
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
index ec18dece6f5..5a0ddb959c7 100644
--- a/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
+++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
@@ -793,7 +793,7 @@ QgsLegendSymbolListV2 QgsCategorizedSymbolRenderer::legendSymbolItemsV2() const
       return QgsFeatureRenderer::legendSymbolItemsV2();
     }
 
-    if ( QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< QgsSizeScaleTransformer* >( ddSize.transformer() ) )
+    if ( const QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< const QgsSizeScaleTransformer* >( ddSize.transformer() ) )
     {
       QgsLegendSymbolItem title( nullptr, ddSize.propertyType() == QgsProperty::ExpressionBasedProperty ? ddSize.expressionString()
                                  : ddSize.field(), QString() );
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
index 75ad2f07fec..ac8b0c4aefa 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
@@ -1180,7 +1180,7 @@ QgsLegendSymbolListV2 QgsGraduatedSymbolRenderer::legendSymbolItemsV2() const
       return QgsFeatureRenderer::legendSymbolItemsV2();
     }
 
-    if ( QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< QgsSizeScaleTransformer* >( ddSize.transformer() ) )
+    if ( const QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< const QgsSizeScaleTransformer* >( ddSize.transformer() ) )
     {
       QgsLegendSymbolItem title( nullptr, ddSize.propertyType() == QgsProperty::ExpressionBasedProperty ? ddSize.expressionString()
                                  : ddSize.field(), QString() );
diff --git a/src/core/symbology-ng/qgssinglesymbolrenderer.cpp b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp
index 99139f8944b..a203803327a 100644
--- a/src/core/symbology-ng/qgssinglesymbolrenderer.cpp
+++ b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp
@@ -308,10 +308,10 @@ QgsLegendSymbolListV2 QgsSingleSymbolRenderer::legendSymbolItemsV2() const
     QgsProperty sizeDD( symbol->dataDefinedSize() );
     if ( sizeDD && sizeDD.isActive() && sizeDD.propertyType() == QgsProperty::ExpressionBasedProperty )
     {
-      if ( QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< QgsSizeScaleTransformer* >( ddSize.transformer() ) )
+      if ( const QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< const QgsSizeScaleTransformer* >( sizeDD.transformer() ) )
       {
-        QgsLegendSymbolItem title( nullptr, ddSize.propertyType() == QgsProperty::ExpressionBasedProperty ? ddSize.expressionString()
-                                   : ddSize.field(), QString() );
+        QgsLegendSymbolItem title( nullptr, sizeDD.propertyType() == QgsProperty::ExpressionBasedProperty ? sizeDD.expressionString()
+                                   : sizeDD.field(), QString() );
         lst << title;
         Q_FOREACH ( double v, QgsSymbolLayerUtils::prettyBreaks( sizeTransformer->minValue(), sizeTransformer->maxValue(), 4 ) )
         {