Get rid of collectorMapper

1 files changed, 5 insertions, 13 deletions

diff --git a/archivemodel.cpp b/archivemodel.cpp
index 549eef5..cbba118 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -10,7 +10,6 @@
 #include <QFile>
 #include <QSettings>
 #include <QMutexLocker>
-#include <QSignalMapper>
 #include <QFileInfo>
 #include <QBrush>
 #include <QFont>
@@ -28,23 +27,16 @@ ArchiveModel::ArchiveModel(const QStringList &headers, QObject *parent) : SmTree
     mAvailableOrders.insert("Genre", Genre);
     mAvailableOrders.insert("Local files", Local);
     mAvailableOrders.insert("Favorites", FavoriteOrder);
-    QSignalMapper *collectorMapper = new QSignalMapper(this);
     ArchiveCollector *c1 = new ArchiveCollector(NumFields, SeriesName, this);
-    connect(c1, SIGNAL(finished()), collectorMapper, SLOT(map()));
-    collectorMapper->setMapping(c1, c1);
+    connect(c1, &ArchiveCollector::finished, [=] { collectorFinished(c1) ;});
     ArchiveCollector *c2 = new ArchiveCollector(NumFields, Actor, this);
-    connect(c2, SIGNAL(finished()), collectorMapper, SLOT(map()));
-    collectorMapper->setMapping(c2, c2);
+    connect(c2, &ArchiveCollector::finished, [=] { collectorFinished(c2) ;});
     ArchiveCollector *c3 = new ArchiveCollector(NumFields, Genre, this);
-    connect(c3, SIGNAL(finished()), collectorMapper, SLOT(map()));
-    collectorMapper->setMapping(c3, c3);
+    connect(c3, &ArchiveCollector::finished, [=] { collectorFinished(c3) ;});
     ArchiveCollector *c4 = new ArchiveCollector(NumFields, Local, this);
-    connect(c4, SIGNAL(finished()), collectorMapper, SLOT(map()));
-    collectorMapper->setMapping(c4, c4);
+    connect(c4, &ArchiveCollector::finished, [=] { collectorFinished(c4) ;});
     ArchiveCollector *c5 = new ArchiveCollector(NumFields, FavoriteOrder, this);
-    connect(c5, SIGNAL(finished()), collectorMapper, SLOT(map()));
-    collectorMapper->setMapping(c5, c5);
-    connect(collectorMapper, SIGNAL(mapped(QObject*)), this, SLOT(collectorFinished(QObject*)));
+    connect(c5, &ArchiveCollector::finished, [=] { collectorFinished(c5) ;});
     mCollectors << c1 << c2 << c3 << c4 << c5;
     connect(this, SIGNAL(needRefresh()), this, SLOT(refresh()));
     readConfig();