From 3bed96abe0f58611e557f863763c412164c3cfa0 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Thu, 21 Dec 2017 07:50:14 +0100
Subject: Removed QSignalMapper from filewidget.cpp

Since the advent of lambdas as SLOTS the signal mapper is indeed useless
und overly complicated. Remove it due to a deprecation warning from the
compiler.
---
 filewidget.cpp | 13 +++----------
 filewidget.h   |  2 --
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/filewidget.cpp b/filewidget.cpp
index 7cb884b..ac7f920 100644
--- a/filewidget.cpp
+++ b/filewidget.cpp
@@ -30,7 +30,6 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QContextMenuEvent>
-#include <QSignalMapper>
 #include <QDirIterator>
 
 #include "filewidget.h"
@@ -43,7 +42,7 @@
 #include "viewer.h"
 #include "progressdialog.h"
 
-FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(0), mCopyToMapper(0) {
+FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(0) {
     mFileCopier = new FileCopier(this);
     mCopyProgress = new ProgressDialog;
     connect(mFileCopier, SIGNAL(newFile(QString,QString,qint64)), this, SLOT(setupProgress(QString,QString,qint64)));
@@ -716,21 +715,15 @@ void FileWidget::contextMenuEvent(QContextMenuEvent *e){
     mCopyToMenu->clear();
     mCopyToMenu->setTitle(tr("Copy Files to..."));
     mCopyToMenu->setIcon(QIcon(":/hourglass_figure.png"));
-    if(mCopyToMapper){
-        mCopyToMapper->deleteLater();
-    }
-    mCopyToMapper = new QSignalMapper;
     QStringList copyToDirs = s.value("copydirs").toStringList();
-    foreach(auto d, copyToDirs){
+    for(QString &d : copyToDirs){
         QFileInfo di(d);
         if(di.exists()){
             QAction *copyA = new QAction(di.fileName(), mCopyToMenu);
-            connect(copyA, SIGNAL(triggered()), mCopyToMapper, SLOT(map()));
-            mCopyToMapper->setMapping(copyA, di.absoluteFilePath());
+            connect(copyA, &QAction::triggered, [=] { copyFiles(di.absoluteFilePath()); });
             mCopyToMenu->addAction(copyA);
         }
     }
-    connect(mCopyToMapper, SIGNAL(mapped(QString)), this, SLOT(copyFiles(QString)));
     contextMenu.addMenu(mCopyToMenu);
     contextMenu.addAction(createSeparator());
     contextMenu.addActions(actions());
diff --git a/filewidget.h b/filewidget.h
index 458d3eb..b4c94e3 100644
--- a/filewidget.h
+++ b/filewidget.h
@@ -21,7 +21,6 @@ class VideoSorter;
 class FileDisplay;
 class OriginDialog;
 class QMenu;
-class QSignalMapper;
 class FileCopier;
 class ProgressDialog;
 
@@ -94,7 +93,6 @@ class FileWidget : public QWidget {
         QTreeView *mFileView;
         QMenuBar *mMenuBar;
         QMenu *mCopyToMenu;
-        QSignalMapper *mCopyToMapper;
         QToolBar *mToolBar;
         QProgressBar *mProgressBar;
         QString mLastDir;
-- 
cgit v1.2.3-70-g09d2