diff --git a/sources/recentfiles.cpp b/sources/recentfiles.cpp
index 9b68995a9..69774b6b6 100644
--- a/sources/recentfiles.cpp
+++ b/sources/recentfiles.cpp
@@ -16,7 +16,6 @@
along with QElectroTech. If not, see .
*/
#include "recentfiles.h"
-#include "qeticons.h"
#include
/**
@@ -33,7 +32,7 @@ RecentFiles::RecentFiles(const QString &identifier, int size, QObject *parent) :
menu_(nullptr)
{
mapper_ = new QSignalMapper(this);
- connect(mapper_, SIGNAL(mapped(const QString &)), this, SLOT(handleMenuRequest(const QString &)));
+ connect(mapper_, &QSignalMapper::mappedString, this, &RecentFiles::fileOpeningRequested);
extractFilesFromSettings();
buildMenu();
@@ -103,13 +102,6 @@ void RecentFiles::save()
saveFilesToSettings();
}
-/**
- Gere les actions sur le menu
-*/
-void RecentFiles::handleMenuRequest(const QString &filepath) {
- emit(fileOpeningRequested(filepath));
-}
-
/**
Gere le fait qu'un fichier ait ete ouvert
@param filepath Chemin du fichier ouvert
@@ -193,6 +185,6 @@ void RecentFiles::buildMenu()
// lie l'action et le mapper
mapper_ -> setMapping(action, filepath);
- connect(action, SIGNAL(triggered()), mapper_, SLOT(map()));
+ connect(action, &QAction::triggered, mapper_, qOverload<>(&QSignalMapper::map));
}
}
diff --git a/sources/recentfiles.h b/sources/recentfiles.h
index 33d59ab48..3e56c95f1 100644
--- a/sources/recentfiles.h
+++ b/sources/recentfiles.h
@@ -54,9 +54,6 @@ class RecentFiles : public QObject {
void saveFilesToSettings();
void buildMenu();
- private slots:
- void handleMenuRequest(const QString &);
-
// attributes
private:
QString identifier_;