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

(limited to 'newpicsdialog.cpp')

diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index dd59f8e..baaed8f 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -33,7 +33,6 @@
 
 NewPicsDialog::NewPicsDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), mFilesCtr(0) {
     qRegisterMetaType<MappingData>("MappingData");
-    qRegisterMetaTypeStreamOperators<MappingData>("MappingData");
     setupDlg();
 }
 
@@ -107,7 +106,7 @@ void NewPicsDialog::addFiles(const QStringList &files){
         return;
     }
     mFilesV->setSortingEnabled(false);
-    for(QString f : files){
+    for(const auto &f : files){
         mFilesModel->addFile(f);
     }
     mFilesV->setSortingEnabled(true);
@@ -127,7 +126,7 @@ void NewPicsDialog::setFile(const QString &file){
 void NewPicsDialog::setDir(const QString &dir){
     mFiles.clear();
     QDir d(dir);
-    for(QFileInfo fi : d.entryInfoList(QDir::Files, QDir::Name)){
+    for(const auto &fi : d.entryInfoList(QDir::Files, QDir::Name)){
         mFiles << fi.absoluteFilePath();
     }
     mFilesCtr = 0;
@@ -167,7 +166,7 @@ void NewPicsDialog::removeFiles(){
     for(QModelIndex i : real){
         perm << i;
     }
-    for(QPersistentModelIndex pi : perm){
+    for(const auto &pi : perm){
         mFilesModel->removeRows(pi.row(), 1, pi.parent());
     }
 }
@@ -196,7 +195,7 @@ void NewPicsDialog::archive(){
     progress.setMinimumWidth(400);
     progress.show();
     int pgctr = 0;
-    for(FileData d : files){
+    for(const auto &d : files){
         ++pgctr;
         progress.setValue(pgctr);
         qApp->processEvents();
@@ -212,7 +211,7 @@ void NewPicsDialog::archive(){
         addFileQ.bindValue(":format", d.mimeType);
         addFileQ.bindValue(":picsize", d.picSize);
         if(addFileQ.exec()){
-            for(QVariant mpid : mappingParentsIds){
+            for(const auto &mpid : mappingParentsIds){
                 addMappingQ.bindValue(":mapid", mpid);
                 addMappingQ.bindValue(":md5", d.md5sum);
                 addMappingQ.exec();
@@ -313,7 +312,7 @@ bool NewPicFilesModel::setData(const QModelIndex &index, const QVariant &value,
 
 void NewPicFilesModel::setFiles(const QStringList &paths) {
     SmTreeItem *rootItem = new SmTreeItem(NumFields);
-    for(QString file : paths){
+    for(const auto &file : paths){
         QFileInfo fi(file);
         QList<QVariant> fileData;
         if(!fi.exists()){
-- 
cgit v1.2.3-70-g09d2