diff options
author | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2022-04-15 13:27:34 +0200 |
commit | 856119c5a43b4781b051b93a0713c152cfd99f85 (patch) | |
tree | 4e2fde4e7a76179cc243e0665091c6ad429ea640 /archivemodel.cpp | |
parent | 62d3ca1482b202d2883eeb5e17e72300e8612477 (diff) | |
download | SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.gz SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.bz2 SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.zip |
Make it run with Qt6
This is a huge commit. Changes:
* Obviously, make it compile
* Make it run (only scarcely tested)
* get rid of most of clang's warnings
Let's see what surprises are in store...
Diffstat (limited to 'archivemodel.cpp')
-rw-r--r-- | archivemodel.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/archivemodel.cpp b/archivemodel.cpp index 20658e9..8e15dea 100644 --- a/archivemodel.cpp +++ b/archivemodel.cpp @@ -28,15 +28,15 @@ ArchiveModel::ArchiveModel(const QStringList &headers, QObject *parent) : SmTree mAvailableOrders.insert("Local files", Local); mAvailableOrders.insert("Favorites", FavoriteOrder); ArchiveCollector *c1 = new ArchiveCollector(NumFields, SeriesName, this); - connect(c1, &ArchiveCollector::finished, [=] { collectorFinished(c1) ;}); + connect(c1, &ArchiveCollector::finished, c1, [=] { collectorFinished(c1) ;}); ArchiveCollector *c2 = new ArchiveCollector(NumFields, Actor, this); - connect(c2, &ArchiveCollector::finished, [=] { collectorFinished(c2) ;}); + connect(c2, &ArchiveCollector::finished, c2, [=] { collectorFinished(c2) ;}); ArchiveCollector *c3 = new ArchiveCollector(NumFields, Genre, this); - connect(c3, &ArchiveCollector::finished, [=] { collectorFinished(c3) ;}); + connect(c3, &ArchiveCollector::finished, c3, [=] { collectorFinished(c3) ;}); ArchiveCollector *c4 = new ArchiveCollector(NumFields, Local, this); - connect(c4, &ArchiveCollector::finished, [=] { collectorFinished(c4) ;}); + connect(c4, &ArchiveCollector::finished, c4, [=] { collectorFinished(c4) ;}); ArchiveCollector *c5 = new ArchiveCollector(NumFields, FavoriteOrder, this); - connect(c5, &ArchiveCollector::finished, [=] { collectorFinished(c5) ;}); + connect(c5, &ArchiveCollector::finished, c5, [=] { collectorFinished(c5) ;}); mCollectors << c1 << c2 << c3 << c4 << c5; connect(this, &ArchiveModel::needRefresh, this, &ArchiveModel::refresh); readConfig(); @@ -81,16 +81,16 @@ QVariant ArchiveModel::data(const QModelIndex &index, int role) const{ int childCount = item->data(Count).toInt(); int nodeType = item->data(Type).toInt(); if(nodeType == SeriesNode || nodeType == GenreNode || nodeType == ActorNode){ - retval = QString("%1 (%2)").arg(item->data(Name).toString()).arg(QString::number(childCount)); + retval = QString("%1 (%2)").arg(item->data(Name).toString(), QString::number(childCount)); }else if(nodeType == SeriesPartNode){ retval = item->data(Name).toString(); QString subtitle = item->data(Subtitle).toString(); if(!subtitle.isEmpty() && (part > 0)){ - retval = QString("%1 - %2 - %3").arg(item->data(Name).toString()).arg(subtitle).arg(QString::number(part)); + retval = QString("%1 - %2 - %3").arg(item->data(Name).toString(), subtitle, QString::number(part)); }else if(part > 0){ - retval = QString("%1 %2").arg(item->data(Name).toString()).arg(QString::number(part)); + retval = QString("%1 %2").arg(item->data(Name).toString(), QString::number(part)); }else if(!subtitle.isEmpty()){ - retval = QString("%1 - %2").arg(item->data(Name).toString()).arg(subtitle); + retval = QString("%1 - %2").arg(item->data(Name).toString(), subtitle); } } return retval; @@ -482,7 +482,7 @@ void ArchiveModel::addFiles(int partId, const QStringList files){ durationOrSize = Helper::picSize(file); fileQ.prepare("INSERT INTO files(iseriespart_id, tfilename, cmd5sum, bisize, sifiletype, cpicsize) VALUES(:id, :fn, :md5, :size, :type, :durOrSize)"); }else{ - QString msg = QString("Unknown mime type %1 for %2").arg(mimeType).arg(file); + QString msg = QString("Unknown mime type %1 for %2").arg(mimeType, file); emit message(msg); continue; } @@ -665,7 +665,7 @@ void ArchiveModel::collectorFinished(QObject *thread){ void ArchiveModel::emitDatabaseError(const QSqlError &e){ QString databaseText = e.databaseText().isEmpty() ? tr("(none)") : e.databaseText(); QString driverText = e.driverText().isEmpty() ? tr("(none)") : e.driverText(); - QString errormsg = QString(tr("<b>Database error:</b><br/><ul><li>driverText(): %1</li><li>databaseText(): %2</li></ul>")).arg(driverText).arg(databaseText); + QString errormsg = QString(tr("<b>Database error:</b><br/><ul><li>driverText(): %1</li><li>databaseText(): %2</li></ul>")).arg(driverText, databaseText); emit databaseError(errormsg); } @@ -901,7 +901,7 @@ bool ArchiveFilesModel::setData(const QModelIndex &idx, const QVariant &value, i QFile f(idx.data(FullPathRole).toString()); QFileInfo fi(f); QString dir = fi.absolutePath(); - QString newName = QString("%1/%2").arg(dir).arg(value.toString()); + QString newName = QString("%1/%2").arg(dir, value.toString()); success = f.rename(newName); } // check rename, too! |