diff options
Diffstat (limited to 'filewidget.cpp')
-rw-r--r-- | filewidget.cpp | 13 |
1 files changed, 3 insertions, 10 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()); |