Fix sip for QgsMapLayerActionRegistry

m-kuhn · m-kuhn · commit 21c81d6f512f · 2014-09-17T09:18:53.000+02:00
diff --git a/python/gui/qgsmaplayeractionregistry.sip b/python/gui/qgsmaplayeractionregistry.sip
@@ -25,9 +25,8 @@ class QgsMapLayerAction : QAction
     /** True if action can run using the specified layer */
     bool canRunUsingLayer( QgsMapLayer* layer ) const;
 
-    /** Triggers the action with the specified layer and feature. This also emits the triggeredForLayer( QgsMapLayer *)
-     * and triggered() slots */
-    void triggerForFeature( QgsMapLayer* layer, QgsFeature* feature );
+    /** Triggers the action with the specified layer and list of feature. */
+    void triggerForFeatures( QgsMapLayer* layer, QList<const QgsFeature*> featureList );
 
     /** Triggers the action with the specified layer. This also emits the triggered() slot. */
     void triggerForLayer( QgsMapLayer* layer );
@@ -37,8 +36,11 @@ class QgsMapLayerAction : QAction
     const Targets& targets() const;
 
   signals:
+    /** Triggered when action has been run for a specific list of features */
+    void triggeredForFeatures( QgsMapLayer* layer, QList<const QgsFeature*> featureList );
+
     /** Triggered when action has been run for a specific feature */
-    void triggeredForFeature( QgsMapLayer* layer, QgsFeature* feature );
+    void triggeredForFeature( QgsMapLayer* layer, const QgsFeature* feature );
 
     /** Triggered when action has been run for a specific layer */
     void triggeredForLayer( QgsMapLayer* layer );
diff --git a/src/gui/qgsmaplayeractionregistry.cpp b/src/gui/qgsmaplayeractionregistry.cpp
@@ -79,7 +79,7 @@ void QgsMapLayerAction::triggerForFeatures( QgsMapLayer* layer, QList<const QgsF
 
 void QgsMapLayerAction::triggerForFeature( QgsMapLayer* layer, const QgsFeature* feature )
 {
-  emit triggeredForFeature( layer, feature );
+  emit triggeredForFeature( layer, *feature );
 }
 
 void QgsMapLayerAction::triggerForLayer( QgsMapLayer* layer )
diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h
@@ -77,7 +77,7 @@ class GUI_EXPORT QgsMapLayerAction : public QAction
     void triggeredForFeatures( QgsMapLayer* layer, QList<const QgsFeature*> featureList );
 
     /** Triggered when action has been run for a specific feature */
-    void triggeredForFeature( QgsMapLayer* layer, const QgsFeature* feature );
+    void triggeredForFeature( QgsMapLayer* layer, const QgsFeature& feature );
 
     /** Triggered when action has been run for a specific layer */
     void triggeredForLayer( QgsMapLayer* layer );

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void QgsMapLayerAction::triggerForFeatures( QgsMapLayer* layer, QList<const QgsF`
`79`	`79`
`80`	`80`	`void QgsMapLayerAction::triggerForFeature( QgsMapLayer* layer, const QgsFeature* feature )`
`81`	`81`	`{`
`82`		`- emit triggeredForFeature( layer, feature );`
	`82`	`+ emit triggeredForFeature( layer, *feature );`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`void QgsMapLayerAction::triggerForLayer( QgsMapLayer* layer )`