Q_FOREACH instead of non const iterator

m-kuhn · m-kuhn · commit a62b02699d49 · 2017-07-28T11:45:17.000+02:00
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -474,7 +474,7 @@ void QgsDualView::viewWillShowContextMenu( QMenu *menu, const QModelIndex &atInd
         continue;
 
       QgsAttributeTableAction *a = new QgsAttributeTableAction( action.name(), this, action.id(), sourceIndex );
-      menu->addAction( action.name(), a, SLOT( execute() ) );
+      menu->addAction( action.name(), a, &QgsAttributeTableAction::execute );
     }
   }
 
@@ -485,11 +485,10 @@ void QgsDualView::viewWillShowContextMenu( QMenu *menu, const QModelIndex &atInd
     //add a separator between user defined and standard actions
     menu->addSeparator();
 
-    QList<QgsMapLayerAction *>::iterator actionIt;
-    for ( actionIt = registeredActions.begin(); actionIt != registeredActions.end(); ++actionIt )
+    Q_FOREACH ( QgsMapLayerAction *action, registeredActions )
     {
-      QgsAttributeTableMapLayerAction *a = new QgsAttributeTableMapLayerAction( ( *actionIt )->text(), this, ( *actionIt ), sourceIndex );
-      menu->addAction( ( *actionIt )->text(), a, &QgsAttributeTableMapLayerAction::execute );
+      QgsAttributeTableMapLayerAction *a = new QgsAttributeTableMapLayerAction( action->text(), this, action, sourceIndex );
+      menu->addAction( action->text(), a, &QgsAttributeTableMapLayerAction::execute );
     }
   }
 
diff --git a/src/gui/qgsmaplayeractionregistry.cpp b/src/gui/qgsmaplayeractionregistry.cpp
@@ -108,12 +108,12 @@ void QgsMapLayerActionRegistry::addMapLayerAction( QgsMapLayerAction *action )
 QList< QgsMapLayerAction * > QgsMapLayerActionRegistry::mapLayerActions( QgsMapLayer *layer, QgsMapLayerAction::Targets targets )
 {
   QList< QgsMapLayerAction * > validActions;
-  QList<QgsMapLayerAction *>::iterator actionIt;
-  for ( actionIt = mMapLayerActionList.begin(); actionIt != mMapLayerActionList.end(); ++actionIt )
+
+  Q_FOREACH ( QgsMapLayerAction *action, mMapLayerActionList )
   {
-    if ( ( *actionIt )->canRunUsingLayer( layer ) && ( targets & ( *actionIt )->targets() ) )
+    if ( action->canRunUsingLayer( layer ) && ( targets & action->targets() ) )
     {
-      validActions.append( ( *actionIt ) );
+      validActions.append( action );
     }
   }
   return validActions;

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ void QgsDualView::viewWillShowContextMenu( QMenu *menu, const QModelIndex &atInd`
`474`	`474`	`continue;`
`475`	`475`
`476`	`476`	`QgsAttributeTableAction *a = new QgsAttributeTableAction( action.name(), this, action.id(), sourceIndex );`
`477`		`- menu->addAction( action.name(), a, SLOT( execute() ) );`
	`477`	`+ menu->addAction( action.name(), a, &QgsAttributeTableAction::execute );`
`478`	`478`	`}`
`479`	`479`	`}`
`480`	`480`
`@@ -485,11 +485,10 @@ void QgsDualView::viewWillShowContextMenu( QMenu *menu, const QModelIndex &atInd`
`485`	`485`	`//add a separator between user defined and standard actions`
`486`	`486`	`menu->addSeparator();`
`487`	`487`
`488`		`- QList<QgsMapLayerAction *>::iterator actionIt;`
`489`		`- for ( actionIt = registeredActions.begin(); actionIt != registeredActions.end(); ++actionIt )`
	`488`	`+ Q_FOREACH ( QgsMapLayerAction *action, registeredActions )`
`490`	`489`	`{`
`491`		`- QgsAttributeTableMapLayerAction a = new QgsAttributeTableMapLayerAction( ( actionIt )->text(), this, ( *actionIt ), sourceIndex );`
`492`		`- menu->addAction( ( *actionIt )->text(), a, &QgsAttributeTableMapLayerAction::execute );`
	`490`	`+ QgsAttributeTableMapLayerAction *a = new QgsAttributeTableMapLayerAction( action->text(), this, action, sourceIndex );`
	`491`	`+ menu->addAction( action->text(), a, &QgsAttributeTableMapLayerAction::execute );`
`493`	`492`	`}`
`494`	`493`	`}`
`495`	`494`
Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,12 @@ void QgsMapLayerActionRegistry::addMapLayerAction( QgsMapLayerAction *action )`
`108`	`108`	`QList< QgsMapLayerAction * > QgsMapLayerActionRegistry::mapLayerActions( QgsMapLayer *layer, QgsMapLayerAction::Targets targets )`
`109`	`109`	`{`
`110`	`110`	`QList< QgsMapLayerAction * > validActions;`
`111`		`- QList<QgsMapLayerAction *>::iterator actionIt;`
`112`		`- for ( actionIt = mMapLayerActionList.begin(); actionIt != mMapLayerActionList.end(); ++actionIt )`
	`111`	`+`
	`112`	`+ Q_FOREACH ( QgsMapLayerAction *action, mMapLayerActionList )`
`113`	`113`	`{`
`114`		`- if ( ( actionIt )->canRunUsingLayer( layer ) && ( targets & ( actionIt )->targets() ) )`
	`114`	`+ if ( action->canRunUsingLayer( layer ) && ( targets & action->targets() ) )`
`115`	`115`	`{`
`116`		`- validActions.append( ( *actionIt ) );`
	`116`	`+ validActions.append( action );`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`return validActions;`