Merge pull request #4937 from m-kuhn/attributeTableCodeEnhancements$

m-kuhn · web-flow · commit 7f1bb72872a6 · 2017-07-28T13:08:14.000+02:00
Attribute table code enhancements
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -474,7 +474,11 @@ void QgsDualView::viewWillShowContextMenu( QMenu *menu, const QModelIndex &atInd
         continue;
 
       QgsAttributeTableAction *a = new QgsAttributeTableAction( action.name(), this, action.id(), sourceIndex );
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
       menu->addAction( action.name(), a, SLOT( execute() ) );
+#else
+      menu->addAction( action.name(), a, &QgsAttributeTableAction::execute );
+#endif
     }
   }
 
@@ -485,17 +489,24 @@ 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, SLOT( execute() ) );
+      QgsAttributeTableMapLayerAction *a = new QgsAttributeTableMapLayerAction( action->text(), this, action, sourceIndex );
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+      menu->addAction( action->text(), a, SLOT( execut() ) );
+#else
+      menu->addAction( action->text(), a, &QgsAttributeTableMapLayerAction::execute );
+#endif
     }
   }
 
   menu->addSeparator();
   QgsAttributeTableAction *a = new QgsAttributeTableAction( tr( "Open form" ), this, QString(), sourceIndex );
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
   menu->addAction( tr( "Open form" ), a, SLOT( featureForm() ) );
+#else
+  menu->addAction( tr( "Open form" ), a, &QgsAttributeTableAction::featureForm );
+#endif
 }
 
 void QgsDualView::showViewHeaderMenu( QPoint point )
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
`@@ -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;`