Merge pull request #520 from 3nids/removeaction

mhugent · mhugent · commit 95f49beede67 · 2013-04-12T04:44:57.000-07:00
add removeAction method to layer actions
diff --git a/python/core/qgsattributeaction.sip b/python/core/qgsattributeaction.sip
@@ -51,7 +51,10 @@ class QgsAttributeAction
     // dialog box.
     void addAction( QgsAction::ActionType type, QString name, QString action, bool capture = false );
 
-    /*! Does the given values. defaultValueIndex is the index of the
+    //! Remove an action at given index
+    void removeAction( int index );
+    
+     /*! Does the given values. defaultValueIndex is the index of the
      *  field to be used if the action has a $currfield placeholder.
      *  @note added in 1.9
      *  @note not available in python bindings
diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp
@@ -45,6 +45,14 @@ void QgsAttributeAction::addAction( QgsAction::ActionType type, QString name, QS
   mActions << QgsAction( type, name, action, capture );
 }
 
+void QgsAttributeAction::removeAction( int index )
+{
+  if ( index >= 0 && index < mActions.size() )
+  {
+    mActions.removeAt( index );
+  }
+}
+
 void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValueIndex )
 {
   QMap<QString, QVariant> substitutionMap;
diff --git a/src/core/qgsattributeaction.h b/src/core/qgsattributeaction.h
@@ -109,6 +109,9 @@ class  CORE_EXPORT QgsAttributeAction
     // dialog box.
     void addAction( QgsAction::ActionType type, QString name, QString action, bool capture = false );
 
+    //! Remove an action at given index
+    void removeAction( int index );
+
     /*! Does the given values. defaultValueIndex is the index of the
      *  field to be used if the action has a $currfield placeholder.
      *  @note added in 1.9

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,14 @@ void QgsAttributeAction::addAction( QgsAction::ActionType type, QString name, QS`
`45`	`45`	`mActions << QgsAction( type, name, action, capture );`
`46`	`46`	`}`
`47`	`47`
	`48`	`+void QgsAttributeAction::removeAction( int index )`
	`49`	`+{`
	`50`	`+ if ( index >= 0 && index < mActions.size() )`
	`51`	`+ {`
	`52`	`+ mActions.removeAt( index );`
	`53`	`+ }`
	`54`	`+}`
	`55`	`+`
`48`	`56`	`void QgsAttributeAction::doAction( int index, QgsFeature &feat, int defaultValueIndex )`
`49`	`57`	`{`
`50`	`58`	`QMap<QString, QVariant> substitutionMap;`