use forward declaration for QgsFeature

signedav · signedav · commit fa625ff02278 · 2018-10-25T14:26:27.000+02:00
and use as_const on featurelist
diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp
@@ -138,15 +138,15 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )
     else
     {
       QMenu *featureMenu = new QMenu();
-      for ( const QgsFeature &feature : features )
+      for ( const QgsFeature &feature : qgis::as_const( features ) )
       {
         QAction *featureAction = featureMenu->addAction( FID_TO_STRING( feature.id() ) );
         connect( featureAction, &QAction::triggered, this, [ = ] { doActionForFeature( layer, feature, point );} );
       }
       QAction *allFeatureAction = featureMenu->addAction( tr( "All Features" ) );
       connect( allFeatureAction, &QAction::triggered, this, [ = ]
       {
-        for ( const QgsFeature &feature : features )
+        for ( const QgsFeature &feature : qgis::as_const( features ) )
         {
           doActionForFeature( layer, feature, point );
         }
diff --git a/src/app/qgsmaptoolfeatureaction.h b/src/app/qgsmaptoolfeatureaction.h
@@ -18,13 +18,13 @@
 
 #include "qgis.h"
 #include "qgsmaptool.h"
-#include "qgsfeature.h"
 
 #include <QObject>
 #include <QPointer>
 #include "qgis_app.h"
 
 class QgsVectorLayer;
+class QgsFeature;
 
 /**
   \brief Map tool for running feature actions on the current layer

Original file line number	Diff line number	Diff line change
`@@ -138,15 +138,15 @@ bool QgsMapToolFeatureAction::doAction( QgsVectorLayer *layer, int x, int y )`
`138`	`138`	`else`
`139`	`139`	`{`
`140`	`140`	`QMenu *featureMenu = new QMenu();`
`141`		`- for ( const QgsFeature &feature : features )`
	`141`	`+ for ( const QgsFeature &feature : qgis::as_const( features ) )`
`142`	`142`	`{`
`143`	`143`	`QAction *featureAction = featureMenu->addAction( FID_TO_STRING( feature.id() ) );`
`144`	`144`	`connect( featureAction, &QAction::triggered, this, [ = ] { doActionForFeature( layer, feature, point );} );`
`145`	`145`	`}`
`146`	`146`	`QAction *allFeatureAction = featureMenu->addAction( tr( "All Features" ) );`
`147`	`147`	`connect( allFeatureAction, &QAction::triggered, this, [ = ]`
`148`	`148`	`{`
`149`		`- for ( const QgsFeature &feature : features )`
	`149`	`+ for ( const QgsFeature &feature : qgis::as_const( features ) )`
`150`	`150`	`{`
`151`	`151`	`doActionForFeature( layer, feature, point );`
`152`	`152`	`}`