Clean up archivemodel.cpp

* remove deprecation warning: use std::sort
* use c++-for instead of Q_FOREACH
* make one remaining connect type-safe

1 files changed, 14 insertions, 14 deletions

diff --git a/archivemodel.cpp b/archivemodel.cpp
index cbba118..d228011 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -38,7 +38,7 @@ ArchiveModel::ArchiveModel(const QStringList &headers, QObject *parent) : SmTree
     ArchiveCollector *c5 = new ArchiveCollector(NumFields, FavoriteOrder, this);
     connect(c5, &ArchiveCollector::finished, [=] { collectorFinished(c5) ;});
     mCollectors << c1 << c2 << c3 << c4 << c5;
-    connect(this, SIGNAL(needRefresh()), this, SLOT(refresh()));
+    connect(this, &ArchiveModel::needRefresh, this, &ArchiveModel::refresh);
     readConfig();
     refresh();
 }
@@ -47,7 +47,7 @@ ArchiveModel::~ArchiveModel(){
     /* We need this, otherwise there are random
      * crashes when we exit and a collector is
      * still runnning */
-    foreach(ArchiveCollector *c, mCollectors){
+    for(ArchiveCollector *c : mCollectors){
         c->setCancelled(true);
         c->wait();
         c->setCancelled(false);
@@ -69,7 +69,7 @@ Qt::DropActions ArchiveModel::supportedDragActions() const{
 
 const QStringList ArchiveModel::availableOrders() const {
     QStringList retval = mAvailableOrders.keys();
-    qSort(retval);
+    std::sort(retval.begin(), retval.end());
     return retval;
 }
 
@@ -266,7 +266,7 @@ QSet<int> ArchiveModel::seriesPartIds(const QModelIndex &idx) const{
 
 QStringList ArchiveModel::actors(const QSet<int> &partIds) const{
     QStringList ids;
-    foreach(int i, partIds){
+    for(int i : partIds){
         ids << QString::number(i);
     }
     QString actorQString = QString("SELECT DISTINCT(tactorname) FROM actors, seriesparts_actormap WHERE seriesparts_actormap.iseriesparts_id IN (%1) AND seriesparts_actormap.iactors_id = actors.iactors_id ORDER BY tactorname ASC").arg(ids.join(","));
@@ -289,7 +289,7 @@ QStringList ArchiveModel::allActors() const{
 
 void ArchiveModel::setActors(int partId, const QStringList &actors){
     QStringList actorsForQ;
-    foreach(QString actor, actors){
+    for(const QString &actor : actors){
         actorsForQ << QString("\'%1\'").arg(actor);
     }
 
@@ -313,7 +313,7 @@ void ArchiveModel::setActors(int partId, const QStringList &actors){
     QSqlQuery insertActorsQ(mDb);
     insertActorsQ.prepare("INSERT INTO seriesparts_actormap (iseriesparts_id, iactors_id) VALUES(:pid, :aid)");
     bool success = false;
-    foreach(int aid, actorIds){
+    for(int aid : actorIds){
         insertActorsQ.bindValue(":pid", partId);
         insertActorsQ.bindValue(":aid", aid);
         success = insertActorsQ.exec();
@@ -327,7 +327,7 @@ void ArchiveModel::setActors(int partId, const QStringList &actors){
 
 QStringList ArchiveModel::genres(const QSet<int> &genreIds) const{
     QStringList ids;
-    foreach(int i, genreIds){
+    for(int i : genreIds){
         ids << QString::number(i);
     }
     QString actorQString = QString("SELECT DISTINCT(tgenrename) FROM genres, seriesparts_genremap WHERE seriesparts_genremap.iseriesparts_id IN (%1) AND seriesparts_genremap.igenres_id = genres.igenres_id ORDER BY tgenrename ASC").arg(ids.join(","));
@@ -350,7 +350,7 @@ QStringList ArchiveModel::allGenres() const{
 
 void ArchiveModel::setGenres(int partId, const QStringList &genres){
     QStringList genresForQ;
-    foreach(QString genre, genres){
+    for(const QString &genre : genres){
         genresForQ << QString("\'%1\'").arg(genre);
     }
 
@@ -374,7 +374,7 @@ void ArchiveModel::setGenres(int partId, const QStringList &genres){
     QSqlQuery insertGenresQ(mDb);
     insertGenresQ.prepare("INSERT INTO seriesparts_genremap (iseriesparts_id, igenres_id) VALUES(:pid, :aid)");
     bool success = false;
-    foreach(int gid, genreIds){
+    for(int gid : genreIds){
         insertGenresQ.bindValue(":pid", partId);
         insertGenresQ.bindValue(":aid", gid);
         success = insertGenresQ.exec();
@@ -465,7 +465,7 @@ bool ArchiveModel::setFavorite(int partId, bool favorite){
 }
 
 void ArchiveModel::addFiles(int partId, const QStringList files){
-    foreach(QString file, files){
+    for(const QString &file : files){
         QFileInfo fi(file);
         qint64 size = fi.size();
         QString md5sum = Helper::md5Sum(file);
@@ -510,7 +510,7 @@ void ArchiveModel::removeFiles(const QList<int> fileIds){
     QSqlQuery dataQ(mDb);
     dataQ.prepare("SELECT tfilename, cmd5sum FROM files WHERE ifiles_id = :id");
     QString md5, fileName;
-    foreach(int id, fileIds){
+    for(int id : fileIds){
         dataQ.bindValue(":id" ,id);
         dataQ.exec();
         while(dataQ.next()){
@@ -538,7 +538,7 @@ bool ArchiveModel::deleteSeriesPart(int partId){
             QString fn = filesQ.value(1).toString();
             fileNames << Helper::createArchivePath(fn, md5);
         }
-        foreach(QString f, fileNames){
+        for(const QString &f : fileNames){
             QFile::remove(f);
         }
     }
@@ -619,7 +619,7 @@ void ArchiveModel::setOrder(const QString &order){
 
 void ArchiveModel::refresh(){
     emit message(tr("Reading archive data..."));
-    foreach(ArchiveCollector *c, mCollectors){
+    for(ArchiveCollector *c : mCollectors){
         if(c->isRunning()){
             c->setCancelled(true);
             c->wait();
@@ -952,7 +952,7 @@ void ArchiveFilesModel::populate(const QSet<int> &seriesPartIds){
     SmTreeItem *pictures = new SmTreeItem(NumFields, root);
     pictures->setData(Expansion, QChar(0x2640));
     QStringList ids;
-    foreach(int i, seriesPartIds){
+    for(int i : seriesPartIds){
         ids << QString::number(i);
     }
     QString queryString = QString("SELECT iseriespart_id, tfilename, cmd5sum, bisize, idvd, sifiletype, sifileno, siquality, ifiles_id, cpicsize, iduration, series.tseries_name, seriesparts.iseriespart, seriesparts.tsubtitle FROM files, seriesparts, series WHERE iseriespart_id IN (%1) and files.iseriespart_id = seriesparts.iseriesparts_id and seriesparts.iseries_id = series.iseries_id ORDER BY tfilename ASC;").arg(ids.join(","));