Get rid of QSignalMapper mOpenWithMapperFS

Replace it with a lambda as SLOT, as stated in the QT documentation.

1 files changed, 4 insertions, 20 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 341cb83..3aeec9d 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -723,10 +723,6 @@ void SheMov::createActions(){
     mPicActionGroup->addAction(mPWDeletePicFromA);
     mPicActionGroup->addAction(mPWEditPicMappingsA);
     mPicActionGroup->addAction(mPWRefreshA);
-
-	// misc
-	mOpenWithMapperFS = new QSignalMapper(this);
-	connect(mOpenWithMapperFS, SIGNAL(mapped(QString)), mFSWidget, SLOT(playSelected(QString)));
 }
 
 void SheMov::createMenus(){
@@ -952,7 +948,7 @@ void SheMov::createMenus(){
 
 void SheMov::createOpenWithMenuFS(){
 	if(mOpenWithGroupFS){
-		foreach(QAction *a, mOpenWithGroupFS->actions()){
+        for(QAction *a : mOpenWithGroupFS->actions()){
 			mOpenWithMenuFS->removeAction(a);
 		}
 		mOpenWithGroupFS->deleteLater();
@@ -961,22 +957,10 @@ void SheMov::createOpenWithMenuFS(){
 	QSettings s;
 	QStringList moviePlayers = s.value("programs_movieviewer/data").toHash().keys();
 	moviePlayers.sort();
-	foreach(QString p, moviePlayers){
-		QAction *a = new QAction(p, mOpenWithGroupFS);
-		mOpenWithMenuFS->addAction(a);
-		mOpenWithMapperFS->setMapping(a, p);
-		connect(a, SIGNAL(triggered()), mOpenWithMapperFS, SLOT(map()));
-	}
-	QAction *sep = new QAction(mOpenWithGroupFS);
-	sep->setSeparator(true);
-	mOpenWithMenuFS->addAction(sep);
-	QStringList picViewers = s.value("programs_pictureviewer/data").toHash().keys();
-	picViewers.sort();
-	foreach(QString p, picViewers){
+    for(QString p : moviePlayers){
 		QAction *a = new QAction(p, mOpenWithGroupFS);
-		mOpenWithMenuFS->addAction(a);
-		mOpenWithMapperFS->setMapping(a, p);
-		connect(a, SIGNAL(triggered()), mOpenWithMapperFS, SLOT(map()));
+        connect(a, &QAction::triggered, [=] { mFSWidget->playSelected(p); });
+        mOpenWithMenuFS->addAction(a);
 	}
 }