more const-correctness and avoid ambiguity in overloaded function

3nids · 3nids · commit a30ddaabf487 · 2014-08-11T15:33:48.000+02:00
diff --git a/python/core/qgsattributeaction.sip b/python/core/qgsattributeaction.sip
@@ -78,7 +78,7 @@ class QgsAttributeAction
      */
     void doAction( int index,
                    QgsFeature &feat,
-                   const QMap<QString, QVariant> *substitutionMap = 0 ) /PyName=doActionFeatureWithSubstitution/;
+                   const QMap<QString, QVariant> *substitutionMap ) /PyName=doActionFeatureWithSubstitution/;
 
     //! Removes all actions
     void clearActions();
diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp
@@ -53,7 +53,7 @@ void QgsAttributeAction::removeAction( int index )
   }
 }
 
-void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValueIndex )
+void QgsAttributeAction::doAction(int index, const QgsFeature& feat, int defaultValueIndex )
 {
   QMap<QString, QVariant> substitutionMap;
   if ( defaultValueIndex >= 0 )
@@ -66,8 +66,7 @@ void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValue
   doAction( index, feat, &substitutionMap );
 }
 
-void QgsAttributeAction::doAction( int index, QgsFeature &feat,
-                                   const QMap<QString, QVariant> *substitutionMap )
+void QgsAttributeAction::doAction( int index, const QgsFeature &feat, const QMap<QString, QVariant> *substitutionMap )
 {
   if ( index < 0 || index >= size() )
     return;
diff --git a/src/core/qgsattributeaction.h b/src/core/qgsattributeaction.h
@@ -118,7 +118,7 @@ class  CORE_EXPORT QgsAttributeAction
      *  @note available in python bindings as doActionFeature
      */
     void doAction( int index,
-                   QgsFeature &feat,
+                   const QgsFeature &feat,
                    int defaultValueIndex = 0 );
 
     /*! Does the action using the expression builder to expand it
@@ -129,8 +129,8 @@ class  CORE_EXPORT QgsAttributeAction
      *  @note available in python bindings as doActionFeatureWithSubstitution
      */
     void doAction( int index,
-                   QgsFeature &feat,
-                   const QMap<QString, QVariant> *substitutionMap = 0 );
+                   const QgsFeature& feat,
+                   const QMap<QString, QVariant> *substitutionMap );
 
     //! Removes all actions
     void clearActions() { mActions.clear(); }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void QgsAttributeAction::removeAction( int index )`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValueIndex )`
	`56`	`+void QgsAttributeAction::doAction(int index, const QgsFeature& feat, int defaultValueIndex )`
`57`	`57`	`{`
`58`	`58`	`QMap<QString, QVariant> substitutionMap;`
`59`	`59`	`if ( defaultValueIndex >= 0 )`
`@@ -66,8 +66,7 @@ void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValue`
`66`	`66`	`doAction( index, feat, &substitutionMap );`
`67`	`67`	`}`
`68`	`68`
`69`		`-void QgsAttributeAction::doAction( int index, QgsFeature &feat,`
`70`		`- const QMap<QString, QVariant> *substitutionMap )`
	`69`	`+void QgsAttributeAction::doAction( int index, const QgsFeature &feat, const QMap<QString, QVariant> *substitutionMap )`
`71`	`70`	`{`
`72`	`71`	`if ( index < 0 \|\| index >= size() )`
`73`	`72`	`return;`