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...
---
 consistencycheck.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'consistencycheck.cpp')

diff --git a/consistencycheck.cpp b/consistencycheck.cpp
index 24d128c..22c0e55 100644
--- a/consistencycheck.cpp
+++ b/consistencycheck.cpp
@@ -60,9 +60,9 @@ ConsistencyCheck::ConsistencyCheck(QWidget *parent, Qt::WindowFlags f) : SmDialo
     // Buttons
 	mCancelExit = new QPushButton(tr("Close"));
 	mCheckDb = new QPushButton(tr("Check database"));
-    connect(mCheckDb, &QPushButton::clicked, [=] { startChecker(ConsistencyCheck::DbCheck); });
+    connect(mCheckDb, &QPushButton::clicked, this, [=] { startChecker(ConsistencyCheck::DbCheck); });
 	mCheckFs = new QPushButton(tr("Check Filesystem"));
-    connect(mCheckFs, &QPushButton::clicked, [=] { startChecker(ConsistencyCheck::FsCheck); });
+    connect(mCheckFs, &QPushButton::clicked, this, [=] { startChecker(ConsistencyCheck::FsCheck); });
 	mCleanup = new QPushButton(tr("Cleanup..."));
     connect(mCleanup, &QPushButton::clicked, this, &ConsistencyCheck::cleanup);
 	mCleanup->setEnabled(false);
@@ -209,7 +209,7 @@ void ConsistencyCheck::moveFiles(const QStringList &files){
 	QString startDir = s.value("paths/selecteddir").toString();
 	QString targetDir = QFileDialog::getExistingDirectory(this, tr("Move stray files to..."), startDir);
 	if(!targetDir.isEmpty()){
-        for(QString file : files){
+        for(const auto &file : files){
 			QFileInfo fi(file);
 			QString tgt = QString("%1%2%3").arg(targetDir).arg(QDir::separator()).arg(fi.fileName());
 			QFileInfo tfi(tgt);
@@ -416,7 +416,7 @@ void ConsistencyChecker::doFsCheck(const QFileInfo &start, const QVector<QString
 	if(start.isDir()){
         QDirIterator it(start.absoluteFilePath(), QDir::AllEntries | QDir::NoDotAndDotDot);
         while(it.hasNext()){
-            QFileInfo fi = it.next();
+            QFileInfo fi(it.next());
             mCancelMutex.lock();
             if(mCanceled){
                 mCancelMutex.unlock();
@@ -428,12 +428,12 @@ void ConsistencyChecker::doFsCheck(const QFileInfo &start, const QVector<QString
             }else{
 				QString md5sum = Helper::md5Sum(fi.absoluteFilePath());
                 if(md5sums.contains(md5sum)){
-                    emit consistencyMsg(QString(tr("OK: %1 -> %2")).arg(fi.fileName()).arg(md5sum));
+                    emit consistencyMsg(QString(tr("OK: %1 -> %2")).arg(fi.fileName(), md5sum));
                 }else{
                     mStrayFilesMutex.lock();
                     mStrayFiles << fi.absoluteFilePath();
                     mStrayFilesMutex.unlock();
-                    emit consistencyMsg(QString(tr("NOT FOUND: %1 -> %2")).arg(fi.fileName()).arg(md5sum));
+                    emit consistencyMsg(QString(tr("NOT FOUND: %1 -> %2")).arg(fi.fileName(), md5sum));
                 }
                 ++mCurCount;
                 if(mCurCount % 50 == 0){
-- 
cgit v1.2.3-70-g09d2