replaced QSignalMapper by lambda functions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8111 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 97 insertions, 157 deletions

diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 93c273165..1a57c54a1 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -21,7 +21,6 @@
 #include <QAction>
 #include <QSettings>
 #include <QApplication>
-#include <QSignalMapper>
 #include <QProgressDialog>
 #include <QMessageBox>
 #include <QFile>
@@ -45,7 +44,6 @@ FileOps::FileOps(QObject *parent) : QObject(parent)
     QAction *separator2 = new QAction(this);
     separator2->setSeparator (true);
     //load settings
-    QSignalMapper *mapper = new QSignalMapper(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("FileOps");
     int count = settings.value("count", 0).toInt();
@@ -65,13 +63,11 @@ FileOps::FileOps(QObject *parent) : QObject(parent)
             m_destinations << settings.value(QString("destination_%1").arg(i)).toString();
             QAction *action = new QAction(name, this);
             action->setShortcut(settings.value(QString("hotkey_%1").arg(i)).toString());
-            connect (action, SIGNAL (triggered (bool)), mapper, SLOT (map()));
-            mapper->setMapping(action, i);
+            connect(action, &QAction::triggered, [i,this]{ execAction(i); });
             UiHelper::instance()->addAction(action, UiHelper::PLAYLIST_MENU);
         }
     }
     settings.endGroup();
-    connect(mapper, SIGNAL(mapped(int)), SLOT(execAction(int)));
     UiHelper::instance()->addAction(separator2, UiHelper::PLAYLIST_MENU);
 }
 
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 1548ec421..42a34e1f2 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -22,7 +22,6 @@
 #include <QLabel>
 #include <QTreeView>
 #include <QMessageBox>
-#include <QSignalMapper>
 #include <QMenu>
 #include <QSettings>
 #include <QInputDialog>
@@ -522,112 +521,86 @@ void MainWindow::createActions()
 
     QMenu* sort_mode_menu = new QMenu (tr("Sort List"), this);
     sort_mode_menu->setIcon(QIcon::fromTheme("view-sort-ascending"));
-    QSignalMapper* signalMapper = new QSignalMapper (this);
-    QAction* titleAct = sort_mode_menu->addAction (tr ("By Title"));
-    connect (titleAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (titleAct, PlayListModel::TITLE);
 
-    QAction* albumAct = sort_mode_menu->addAction (tr ("By Album"));
-    connect (albumAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumAct, PlayListModel::ALBUM);
+    QAction *titleAct = sort_mode_menu->addAction(tr ("By Title"));
+    connect(titleAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::TITLE); } );
 
-    QAction* artistAct = sort_mode_menu->addAction (tr ("By Artist"));
-    connect (artistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (artistAct, PlayListModel::ARTIST);
+    QAction *albumAct = sort_mode_menu->addAction(tr ("By Album"));
+    connect(albumAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ALBUM); } );
 
-    QAction* albumArtistAct = sort_mode_menu->addAction (tr ("By Album Artist"));
-    connect (albumArtistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumArtistAct, PlayListModel::ALBUMARTIST);
+    QAction *artistAct = sort_mode_menu->addAction(tr ("By Artist"));
+    connect(artistAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ARTIST); } );
 
-    QAction* nameAct = sort_mode_menu->addAction (tr ("By Filename"));
-    connect (nameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (nameAct, PlayListModel::FILENAME);
+    QAction *albumArtistAct = sort_mode_menu->addAction(tr ("By Album Artist"));
+    connect(albumArtistAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ALBUMARTIST); } );
 
-    QAction* pathnameAct = sort_mode_menu->addAction (tr ("By Path + Filename"));
-    connect (pathnameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (pathnameAct, PlayListModel::PATH_AND_FILENAME);
+    QAction *nameAct = sort_mode_menu->addAction(tr ("By Filename"));
+    connect(nameAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILENAME); } );
 
-    QAction* dateAct = sort_mode_menu->addAction (tr ("By Date"));
-    connect (dateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (dateAct, PlayListModel::DATE);
+    QAction *pathnameAct = sort_mode_menu->addAction(tr ("By Path + Filename"));
+    connect(pathnameAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::PATH_AND_FILENAME); } );
 
-    QAction* trackAct = sort_mode_menu->addAction (tr("By Track Number"));
-    connect (trackAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (trackAct, PlayListModel::TRACK);
+    QAction *dateAct = sort_mode_menu->addAction(tr ("By Date"));
+    connect(dateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::DATE); } );
 
-    QAction* discAct = sort_mode_menu->addAction (tr("By Disc Number"));
-    connect (discAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (discAct, PlayListModel::DISCNUMBER);
+    QAction *trackAct = sort_mode_menu->addAction(tr("By Track Number"));
+    connect(trackAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::TRACK); } );
 
-    QAction* fileCreationDateAct = sort_mode_menu->addAction (tr("By File Creation Date"));
-    connect (fileCreationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileCreationDateAct, PlayListModel::FILE_CREATION_DATE);
+    QAction *discAct = sort_mode_menu->addAction(tr("By Disc Number"));
+    connect(discAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::DISCNUMBER); } );
 
-    QAction* fileModificationDateAct = sort_mode_menu->addAction (tr("By File Modification Date"));
-    connect (fileModificationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileModificationDateAct, PlayListModel::FILE_MODIFICATION_DATE);
+    QAction *fileCreationDateAct = sort_mode_menu->addAction(tr("By File Creation Date"));
+    connect(fileCreationDateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILE_CREATION_DATE); } );
 
-    QAction* groupAct = sort_mode_menu->addAction (tr("By Group"));
-    connect (groupAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (groupAct, PlayListModel::GROUP);
+    QAction *fileModificationDateAct = sort_mode_menu->addAction(tr("By File Modification Date"));
+    connect(fileModificationDateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILE_MODIFICATION_DATE); } );
 
-    connect (signalMapper, SIGNAL (mapped (int)), m_pl_manager, SLOT (sort (int)));
+    QAction *groupAct = sort_mode_menu->addAction(tr("By Group"));
+    connect(groupAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::GROUP); } );
 
     m_ui.menuEdit->addMenu (sort_mode_menu);
 
     sort_mode_menu = new QMenu (tr("Sort Selection"), this);
     sort_mode_menu->setIcon(QIcon::fromTheme("view-sort-ascending"));
-    signalMapper = new QSignalMapper (this);
-    titleAct = sort_mode_menu->addAction (tr ("By Title"));
-    connect (titleAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (titleAct, PlayListModel::TITLE);
 
-    albumAct = sort_mode_menu->addAction (tr ("By Album"));
-    connect (albumAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumAct, PlayListModel::ALBUM);
+    titleAct = sort_mode_menu->addAction(tr ("By Title"));
+    connect(titleAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::TITLE); });
 
-    artistAct = sort_mode_menu->addAction (tr ("By Artist"));
-    connect (artistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (artistAct, PlayListModel::ARTIST);
+    albumAct = sort_mode_menu->addAction(tr ("By Album"));
+    connect(albumAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ALBUM); });
 
-    albumArtistAct = sort_mode_menu->addAction (tr ("By Album Artist"));
-    connect (albumArtistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumArtistAct, PlayListModel::ALBUMARTIST);
+    artistAct = sort_mode_menu->addAction(tr ("By Artist"));
+    connect(artistAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ARTIST); });
 
-    nameAct = sort_mode_menu->addAction (tr ("By Filename"));
-    connect (nameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (nameAct, PlayListModel::FILENAME);
+    albumArtistAct = sort_mode_menu->addAction(tr ("By Album Artist"));
+    connect(albumArtistAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ALBUMARTIST); });
 
-    pathnameAct = sort_mode_menu->addAction (tr ("By Path + Filename"));
-    connect (pathnameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (pathnameAct, PlayListModel::PATH_AND_FILENAME);
+    nameAct = sort_mode_menu->addAction(tr ("By Filename"));
+    connect(nameAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILENAME); });
 
-    dateAct = sort_mode_menu->addAction (tr ("By Date"));
-    connect (dateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (dateAct, PlayListModel::DATE);
+    pathnameAct = sort_mode_menu->addAction(tr ("By Path + Filename"));
+    connect(pathnameAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::PATH_AND_FILENAME); });
 
-    trackAct = sort_mode_menu->addAction (tr ("By Track Number"));
-    connect (trackAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (trackAct, PlayListModel::TRACK);
+    dateAct = sort_mode_menu->addAction(tr ("By Date"));
+    connect(dateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::DATE); });
 
-    discAct = sort_mode_menu->addAction (tr("By Disc Number"));
-    connect (discAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (discAct, PlayListModel::DISCNUMBER);
+    trackAct = sort_mode_menu->addAction(tr ("By Track Number"));
+    connect(trackAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::TRACK); });
 
-    fileCreationDateAct = sort_mode_menu->addAction (tr("By File Creation Date"));
-    connect (fileCreationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileCreationDateAct, PlayListModel::FILE_CREATION_DATE);
+    discAct = sort_mode_menu->addAction(tr("By Disc Number"));
+    connect(discAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::DISCNUMBER); });
 
-    fileModificationDateAct = sort_mode_menu->addAction (tr("By File Modification Date"));
-    connect (fileModificationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileModificationDateAct, PlayListModel::FILE_MODIFICATION_DATE);
+    fileCreationDateAct = sort_mode_menu->addAction(tr("By File Creation Date"));
+    connect(fileCreationDateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILE_CREATION_DATE); });
+
+    fileModificationDateAct = sort_mode_menu->addAction(tr("By File Modification Date"));
+    connect(fileModificationDateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILE_MODIFICATION_DATE ); });
 
-    connect (signalMapper, SIGNAL (mapped (int)), m_pl_manager, SLOT (sortSelection (int)));
     m_ui.menuEdit->addMenu (sort_mode_menu);
     m_ui.menuEdit->addSeparator();
-    m_ui.menuEdit->addAction (QIcon::fromTheme("media-playlist-shuffle"), tr("Randomize List"),
+    m_ui.menuEdit->addAction(QIcon::fromTheme("media-playlist-shuffle"), tr("Randomize List"),
                               m_pl_manager, SLOT(randomizeList()));
-    m_ui.menuEdit->addAction (QIcon::fromTheme("view-sort-descending"), tr("Reverse List"),
+    m_ui.menuEdit->addAction(QIcon::fromTheme("view-sort-descending"), tr("Reverse List"),
                               m_pl_manager, SLOT(reverseList()));
     m_ui.menuEdit->addAction(SET_ACTION(ActionManager::PL_GROUP_TRACKS, m_ui_settings, SLOT(setGroupsEnabled(bool))));
     ACTION(ActionManager::PL_GROUP_TRACKS)->setChecked(m_ui_settings->isGroupsEnabled());
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index f6aad30f7..cc42e3374 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -22,7 +22,6 @@
 #include <QSettings>
 #include <QMenu>
 #include <QAction>
-#include <QSignalMapper>
 #include <QCloseEvent>
 #include <QInputDialog>
 #include <QScreen>
@@ -227,109 +226,81 @@ void PlayList::createActions()
     m_sortMenu->addAction(SET_ACTION(ActionManager::PL_SHOW_INFO, m_pl_manager, SLOT (showDetails ())));
     m_sortMenu->addSeparator();
 
-    QMenu* sort_mode_menu = new QMenu (tr("Sort List"), m_sortMenu);
+    QMenu* sort_mode_menu = new QMenu (tr("Sort List"), this);
     sort_mode_menu->setIcon(QIcon::fromTheme("view-sort-ascending"));
-    QSignalMapper* signalMapper = new QSignalMapper (this);
-    QAction* titleAct = sort_mode_menu->addAction (tr ("By Title"));
-    connect (titleAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (titleAct, PlayListModel::TITLE);
 
-    QAction* albumAct = sort_mode_menu->addAction (tr ("By Album"));
-    connect (albumAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumAct, PlayListModel::ALBUM);
+    QAction *titleAct = sort_mode_menu->addAction(tr ("By Title"));
+    connect(titleAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::TITLE); } );
 
-    QAction* discnumberAct = sort_mode_menu->addAction (tr ("By Disc Number"));
-    connect (discnumberAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (discnumberAct, PlayListModel::DISCNUMBER);
+    QAction *albumAct = sort_mode_menu->addAction(tr ("By Album"));
+    connect(albumAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ALBUM); } );
 
-    QAction* artistAct = sort_mode_menu->addAction (tr ("By Artist"));
-    connect (artistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (artistAct, PlayListModel::ARTIST);
+    QAction *artistAct = sort_mode_menu->addAction(tr ("By Artist"));
+    connect(artistAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ARTIST); } );
 
-    QAction* albumArtistAct = sort_mode_menu->addAction (tr ("By Album Artist"));
-    connect (albumArtistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumArtistAct, PlayListModel::ALBUMARTIST);
+    QAction *albumArtistAct = sort_mode_menu->addAction(tr ("By Album Artist"));
+    connect(albumArtistAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::ALBUMARTIST); } );
 
-    QAction* nameAct = sort_mode_menu->addAction (tr ("By Filename"));
-    connect (nameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (nameAct, PlayListModel::FILENAME);
+    QAction *nameAct = sort_mode_menu->addAction(tr ("By Filename"));
+    connect(nameAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILENAME); } );
 
-    QAction* pathnameAct = sort_mode_menu->addAction (tr ("By Path + Filename"));
-    connect (pathnameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (pathnameAct, PlayListModel::PATH_AND_FILENAME);
+    QAction *pathnameAct = sort_mode_menu->addAction(tr ("By Path + Filename"));
+    connect(pathnameAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::PATH_AND_FILENAME); } );
 
-    QAction* dateAct = sort_mode_menu->addAction (tr ("By Date"));
-    connect (dateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (dateAct, PlayListModel::DATE);
+    QAction *dateAct = sort_mode_menu->addAction(tr ("By Date"));
+    connect(dateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::DATE); } );
 
-    QAction* trackAct = sort_mode_menu->addAction (tr("By Track Number"));
-    connect (trackAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (trackAct, PlayListModel::TRACK);
+    QAction *trackAct = sort_mode_menu->addAction(tr("By Track Number"));
+    connect(trackAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::TRACK); } );
 
-    QAction* fileCreationDateAct = sort_mode_menu->addAction (tr("By File Creation Date"));
-    connect (fileCreationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileCreationDateAct, PlayListModel::FILE_CREATION_DATE);
+    QAction *discAct = sort_mode_menu->addAction(tr("By Disc Number"));
+    connect(discAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::DISCNUMBER); } );
 
-    QAction* fileModificationDateAct = sort_mode_menu->addAction (tr("By File Modification Date"));
-    connect (fileModificationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileModificationDateAct, PlayListModel::FILE_MODIFICATION_DATE);
+    QAction *fileCreationDateAct = sort_mode_menu->addAction(tr("By File Creation Date"));
+    connect(fileCreationDateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILE_CREATION_DATE); } );
 
-    QAction* groupAct = sort_mode_menu->addAction (tr("By Group"));
-    connect (groupAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (groupAct, PlayListModel::GROUP);
+    QAction *fileModificationDateAct = sort_mode_menu->addAction(tr("By File Modification Date"));
+    connect(fileModificationDateAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::FILE_MODIFICATION_DATE); } );
 
-    connect (signalMapper, SIGNAL (mapped (int)), m_pl_manager, SLOT (sort (int)));
+    QAction *groupAct = sort_mode_menu->addAction(tr("By Group"));
+    connect(groupAct, &QAction::triggered, [this]{ m_pl_manager->sort(PlayListModel::GROUP); } );
 
     m_sortMenu->addMenu (sort_mode_menu);
 
     sort_mode_menu = new QMenu (tr("Sort Selection"), m_sortMenu);
     sort_mode_menu->setIcon(QIcon::fromTheme("view-sort-ascending"));
-    signalMapper = new QSignalMapper (this);
-    titleAct = sort_mode_menu->addAction (tr ("By Title"));
-    connect (titleAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (titleAct, PlayListModel::TITLE);
+    titleAct = sort_mode_menu->addAction(tr ("By Title"));
+    connect(titleAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::TITLE); });
 
-    albumAct = sort_mode_menu->addAction (tr ("By Album"));
-    connect (albumAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumAct, PlayListModel::ALBUM);
+    albumAct = sort_mode_menu->addAction(tr ("By Album"));
+    connect(albumAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ALBUM); });
 
-    discnumberAct = sort_mode_menu->addAction (tr ("By Disc Number"));
-    connect (discnumberAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (discnumberAct, PlayListModel::DISCNUMBER);
+    artistAct = sort_mode_menu->addAction(tr ("By Artist"));
+    connect(artistAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ARTIST); });
 
-    artistAct = sort_mode_menu->addAction (tr ("By Artist"));
-    connect (artistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (artistAct, PlayListModel::ARTIST);
+    albumArtistAct = sort_mode_menu->addAction(tr ("By Album Artist"));
+    connect(albumArtistAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::ALBUMARTIST); });
 
-    albumArtistAct = sort_mode_menu->addAction (tr ("By Album Artist"));
-    connect (albumArtistAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (albumArtistAct, PlayListModel::ALBUMARTIST);
+    nameAct = sort_mode_menu->addAction(tr ("By Filename"));
+    connect(nameAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILENAME); });
 
-    nameAct = sort_mode_menu->addAction (tr ("By Filename"));
-    connect (nameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (nameAct, PlayListModel::FILENAME);
+    pathnameAct = sort_mode_menu->addAction(tr ("By Path + Filename"));
+    connect(pathnameAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::PATH_AND_FILENAME); });
 
-    pathnameAct = sort_mode_menu->addAction (tr ("By Path + Filename"));
-    connect (pathnameAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (pathnameAct, PlayListModel::PATH_AND_FILENAME);
+    dateAct = sort_mode_menu->addAction(tr ("By Date"));
+    connect(dateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::DATE); });
 
-    dateAct = sort_mode_menu->addAction (tr ("By Date"));
-    connect (dateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (dateAct, PlayListModel::DATE);
+    trackAct = sort_mode_menu->addAction(tr ("By Track Number"));
+    connect(trackAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::TRACK); });
 
-    trackAct = sort_mode_menu->addAction (tr ("By Track Number"));
-    connect (trackAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (trackAct, PlayListModel::TRACK);
+    discAct = sort_mode_menu->addAction(tr("By Disc Number"));
+    connect(discAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::DISCNUMBER); });
 
-    fileCreationDateAct = sort_mode_menu->addAction (tr("By File Creation Date"));
-    connect (fileCreationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileCreationDateAct, PlayListModel::FILE_CREATION_DATE);
+    fileCreationDateAct = sort_mode_menu->addAction(tr("By File Creation Date"));
+    connect(fileCreationDateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILE_CREATION_DATE); });
 
-    fileModificationDateAct = sort_mode_menu->addAction (tr("By File Modification Date"));
-    connect (fileModificationDateAct, SIGNAL (triggered (bool)), signalMapper, SLOT (map()));
-    signalMapper->setMapping (fileModificationDateAct, PlayListModel::FILE_MODIFICATION_DATE);
-
-    connect (signalMapper, SIGNAL (mapped (int)), m_pl_manager, SLOT (sortSelection (int)));
+    fileModificationDateAct = sort_mode_menu->addAction(tr("By File Modification Date"));
+    connect(fileModificationDateAct, &QAction::triggered, [this]{ m_pl_manager->sortSelection(PlayListModel::FILE_MODIFICATION_DATE ); });
 
     m_sortMenu->addMenu (sort_mode_menu);
     m_sortMenu->addSeparator();