use proper type in convert functions interface

qgis · May 22, 2015 · e0098a5 · e0098a5
1 parent c49884f
commit e0098a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -642,7 +642,7 @@ void QgsFeatureRendererV2::setPaintEffect( QgsPaintEffect *effect )
   mPaintEffect = effect;
 }
 
-void QgsFeatureRendererV2::convertSymbolSizeScale( QgsSymbolV2 * symbol, int method, const QString & field )
+void QgsFeatureRendererV2::convertSymbolSizeScale( QgsSymbolV2 * symbol, QgsSymbolV2::ScaleMethod method, const QString & field )
 {
   if ( symbol->type() == QgsSymbolV2::Marker )
   {

diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h
@@ -19,6 +19,7 @@
 #include "qgis.h"
 #include "qgsrectangle.h"
 #include "qgsrendercontext.h"
+#include "qgssymbolv2.h"
 
 #include <QList>
 #include <QString>
@@ -28,7 +29,6 @@
 #include <QDomDocument>
 #include <QDomElement>
 
-class QgsSymbolV2;
 class QgsFeature;
 class QgsFields;
 class QgsVectorLayer;
@@ -275,7 +275,7 @@ class CORE_EXPORT QgsFeatureRendererV2
     /**@note this function is used to convert old sizeScale expresssions to symbol 
      * level DataDefined size
      */
-    static void convertSymbolSizeScale( QgsSymbolV2 * symbol, int method, const QString & field );
+    static void convertSymbolSizeScale( QgsSymbolV2 * symbol, QgsSymbolV2::ScaleMethod method, const QString & field );
     /**@note this function is used to convert old rotations expresssions to symbol 
      * level DataDefined angle
      */