From 856119c5a43b4781b051b93a0713c152cfd99f85 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Fri, 15 Apr 2022 13:27:34 +0200
Subject: 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...
---
 randomtab.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'randomtab.cpp')

diff --git a/randomtab.cpp b/randomtab.cpp
index 292ae98..b80fd9b 100644
--- a/randomtab.cpp
+++ b/randomtab.cpp
@@ -222,7 +222,7 @@ QStringList RandomTab::validDvdNos(){
             retval << no;
         }
     }
-    logMessage(QString(tr("Found %1 valid Dirs: (%2)")).arg(QString::number(retval.count())).arg(retval.join(',')));
+    logMessage(QString(tr("Found %1 valid Dirs: (%2)")).arg(QString::number(retval.count()), retval.join(',')));
     return retval;
 }
 
@@ -297,7 +297,7 @@ void RandomTab::select(){
     QVector<int> gIds;
     QString gids = genreIds.join(',');
     logMessage(QString(tr("Genres: (%1)")).arg(gids));
-    QString genreQString = QString("SELECT ifiles_id FROM files WHERE iseriespart_id IN (SELECT distinct(iseriesparts_id) FROM seriesparts_genremap WHERE igenres_id IN (%1)) AND sifiletype = 1 AND (idvd = -1 OR idvd IN (%2))").arg(gids).arg(mValidDvds.join(','));
+    QString genreQString = QString("SELECT ifiles_id FROM files WHERE iseriespart_id IN (SELECT distinct(iseriesparts_id) FROM seriesparts_genremap WHERE igenres_id IN (%1)) AND sifiletype = 1 AND (idvd = -1 OR idvd IN (%2))").arg(gids, mValidDvds.join(','));
     logMessage(genreQString);
     QSqlQuery gQ(genreQString, mDb);
     while(gQ.next()){
@@ -316,7 +316,7 @@ void RandomTab::select(){
     QVector<int> aIds;
     QString aids = actorIds.join(',');
     logMessage(QString(tr("Actors: (%1)")).arg(aids));
-    QString actorQString = QString("SELECT ifiles_id FROM files WHERE iseriespart_id IN (SELECT distinct(iseriesparts_id) FROM seriesparts_actormap WHERE iactors_id IN (%1)) AND sifiletype = 1 AND (idvd = -1 OR idvd IN (%2))").arg(aids).arg(mValidDvds.join(','));
+    QString actorQString = QString("SELECT ifiles_id FROM files WHERE iseriespart_id IN (SELECT distinct(iseriesparts_id) FROM seriesparts_actormap WHERE iactors_id IN (%1)) AND sifiletype = 1 AND (idvd = -1 OR idvd IN (%2))").arg(aids, mValidDvds.join(','));
     logMessage(actorQString);
     QSqlQuery aQ(actorQString, mDb);
     while(aQ.next()){
@@ -356,7 +356,7 @@ void RandomTab::select(){
     if(finalIds.count() < selCount){
         count = finalIds.count();;
     }
-    logMessage(QString(tr("Count is %1 out of %2")).arg(QString::number(count)).arg(QString::number(finalIds.count())));
+    logMessage(QString(tr("Count is %1 out of %2")).arg(QString::number(count), QString::number(finalIds.count())));
 
     mFileModel->clear();
     mFileModel->setHorizontalHeaderLabels(QStringList() << tr("Filename") << tr("Size (MB)") << tr("Dur.") << tr("MD5") << tr("LOC") << tr("Full Path"));
@@ -460,13 +460,13 @@ void RandomTab::play(const QStringList &files){
     QString program = pgdata.first;
     QStringList args = pgdata.second;
     args.append(files);
-    logMessage(QString(tr("Cmd: %1 %2")).arg(program).arg(args.join(" ")));
+    logMessage(QString(tr("Cmd: %1 %2")).arg(program, args.join(" ")));
     QProcess::startDetached(program, args);
 }
 
 void RandomTab::logMessage(const QString &msg){
     QDateTime now = QDateTime::currentDateTime();
-    QString msg1 = QString("[%1] %2").arg(now.toString()).arg(msg);
+    QString msg1 = QString("[%1] %2").arg(now.toString(), msg);
     mLog->append(msg1);
 }
 
-- 
cgit v1.2.3-70-g09d2