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...
---
 helper.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'helper.cpp')

diff --git a/helper.cpp b/helper.cpp
index 6a6a05c..02e27b3 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -20,7 +20,6 @@
 #include <QRect>
 #include <QTime>
 #include <QWidget>
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -134,7 +133,7 @@ namespace Helper {
 		QFileInfo info(path);
 		QString retval;
 		if(withMd5){
-			retval = QString("%1/%2/%3/%4_%5.%6").arg(archiveDir).arg(md5[0]).arg(md5[1]).arg(info.completeBaseName()).arg(md5).arg(info.suffix());
+            retval = QString("%1/%2/%3/%4_%5.%6").arg(archiveDir, md5[0], md5[1], info.completeBaseName(), md5, info.suffix());
 		}else{
 			retval = QString("%1/%2/%3/%4").arg(archiveDir).arg(md5[0]).arg(md5[1]).arg(info.fileName());
 		}
@@ -152,7 +151,7 @@ namespace Helper {
             seriesDir.append(QString(" - %1").arg(subtitle));
         }
         seriesDir.replace(' ', '.');
-        QString retval = QString("%1/DVD_%2/%3/%4").arg(usbPath).arg(QString::number(dvdNo)).arg(seriesDir).arg(filename);
+        QString retval = QString("%1/DVD_%2/%3/%4").arg(usbPath, QString::number(dvdNo), seriesDir, filename);
         return retval;
     }
 
@@ -165,7 +164,7 @@ namespace Helper {
 		}
 		QHash<QString, QVariant> programData;
 		if(!preferred.isEmpty()){
-			if(data.keys().contains(preferred)){
+            if(data.contains(preferred)){
 				programData = data.value(preferred).toHash();
 				return qMakePair(programData.value("path").toString(), programData.value("args").toStringList());
 			}
@@ -209,7 +208,7 @@ namespace Helper {
 
 	const QStringList toStringList(const QList<QVariant> &list){
 		QStringList retval;
-        for(QVariant v : list){
+        for(const auto &v : list){
 			retval << v.toString();
 		}
 		return retval;
@@ -221,13 +220,6 @@ namespace Helper {
         return QString::fromLatin1(colString);
 	}
 
-	void centerWidget(QWidget *widget){
-		QRect widgetRect = widget->rect();
-        widgetRect.moveCenter(qApp->desktop()->screenGeometry(widget).center());
-		widget->move(widgetRect.topLeft());
-	}
-
-
     QVariantMap ffmpegData(const QString &path){
         QSettings s;
         QString ffProbe = s.value("paths/ffprobe").toString();
@@ -314,7 +306,7 @@ namespace Helper {
     QVariant picSize(const QString &path){
         Magick::Image img;
         img.ping(qPrintable(path));
-        QString retval = QString("%1x%2").arg(QString::number(img.columns())).arg(QString::number(img.rows()));
+        QString retval = QString("%1x%2").arg(QString::number(img.columns()), QString::number(img.rows()));
         return retval;
     }
 
-- 
cgit v1.2.3-70-g09d2