diff options
| -rw-r--r-- | consistencycheck.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/consistencycheck.cpp b/consistencycheck.cpp index 3bbd871..52427a2 100644 --- a/consistencycheck.cpp +++ b/consistencycheck.cpp @@ -5,11 +5,11 @@ 2 of the License, or (at your option) any later version. */ -#include <QtWidgets/QLabel> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QPlainTextEdit> -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QVBoxLayout> +#include <QLabel> +#include <QPushButton> +#include <QPlainTextEdit> +#include <QHBoxLayout> +#include <QVBoxLayout> #include <QSqlQuery> #include <QFileInfo> #include <QTextCursor> @@ -18,13 +18,12 @@ #include <QTextCharFormat> #include <QBrush> #include <QTextBlock> -#include <QtWidgets/QCheckBox> #include <QSettings> -#include <QDir> -#include <QtWidgets/QFileDialog> -#include <QtWidgets/QMessageBox> -#include <QtWidgets/QProgressBar> -#include <QtWidgets/QGroupBox> +#include <QDirIterator> +#include <QFileDialog> +#include <QMessageBox> +#include <QProgressBar> +#include <QGroupBox> #include "consistencycheck.h" #include "helper.h" @@ -73,15 +72,15 @@ ConsistencyCheck::ConsistencyCheck(QWidget *parent, Qt::WindowFlags f) : SmDialo buttonLayout->addWidget(mCleanup); buttonLayout->addStretch(); buttonLayout->addWidget(mCancelExit); - connect(mCancelExit, SIGNAL(clicked()), this, SLOT(accept())); + connect(mCancelExit, &QPushButton::clicked, this, &ConsistencyCheck::accept); //misc mChecker = new ConsistencyChecker(this); - connect(mChecker, SIGNAL(started()), this, SLOT(checkerStarted())); - connect(mChecker, SIGNAL(finished()), this, SLOT(checkerFinished())); - connect(mChecker, SIGNAL(consistencyMsg(QString)), this, SLOT(addMessage(QString))); - connect(mChecker, SIGNAL(approxTotal(int)), this, SLOT(setProgressBarMax(int))); - connect(mChecker, SIGNAL(progress(int)), this, SLOT(setProgress(int))); + connect(mChecker, &ConsistencyChecker::started, this, &ConsistencyCheck::checkerStarted); + connect(mChecker, &ConsistencyChecker::finished, this, &ConsistencyCheck::checkerFinished); + connect(mChecker, &ConsistencyChecker::consistencyMsg, this, &ConsistencyCheck::addMessage); + connect(mChecker, &ConsistencyChecker::approxTotal, this, &ConsistencyCheck::setProgressBarMax); + connect(mChecker, &ConsistencyChecker::progress, this, &ConsistencyCheck::setProgress); // main layout QVBoxLayout *mainLayout = new QVBoxLayout; @@ -157,7 +156,7 @@ void ConsistencyCheck::checkerStarted(){ mCheckFs->setEnabled(false); mCancelExit->setText(tr("Cancel")); mCancelExit->disconnect(); - connect(mCancelExit, SIGNAL(clicked()), this, SLOT(cancelChecker())); + connect(mCancelExit, &QPushButton::clicked, this, &ConsistencyCheck::cancelChecker); } void ConsistencyCheck::checkerFinished(){ @@ -167,7 +166,7 @@ void ConsistencyCheck::checkerFinished(){ mCheckFs->setEnabled(true); mCancelExit->setText(tr("Close")); mCancelExit->disconnect(); - connect(mCancelExit, SIGNAL(clicked()), this, SLOT(accept())); + connect(mCancelExit, &QPushButton::clicked, this, &ConsistencyCheck::accept); mChecker->setCancel(false); if(!mChecker->strayPicIds().isEmpty() || !mChecker->strayFileIds().isEmpty() || mChecker->strayFiles().isEmpty()){ mCleanup->setEnabled(true); @@ -210,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()){ - foreach(QString file, files){ + for(QString file : files){ QFileInfo fi(file); QString tgt = QString("%1%2%3").arg(targetDir).arg(QDir::separator()).arg(fi.fileName()); QFileInfo tfi(tgt); @@ -269,7 +268,7 @@ void ConsistencyChecker::setCancel(bool cancel){ void ConsistencyChecker::deleteFileIds(const QList<int> &ids){ QSqlQuery idQuery(mDb); idQuery.prepare("DELETE FROM files WHERE ifiles_id = :id"); - foreach(int id, ids){ + for(int id : ids){ idQuery.bindValue(":id", id); idQuery.exec(); } @@ -278,7 +277,7 @@ void ConsistencyChecker::deleteFileIds(const QList<int> &ids){ void ConsistencyChecker::deletePicIds(const QList<int> &ids){ QSqlQuery idQuery(mDb); idQuery.prepare("DELETE FROM pics WHERE ipicsid = :id"); - foreach(int id, ids){ + for(int id : ids){ idQuery.bindValue(":id", id); idQuery.exec(); } @@ -415,8 +414,9 @@ void ConsistencyChecker::fsCheck(){ void ConsistencyChecker::doFsCheck(const QFileInfo &start, const QVector<QString> &md5sums){ if(start.isDir()){ - QDir curDir(start.absoluteFilePath()); - foreach(QFileInfo fi, curDir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot)){ + QDirIterator it(start.absoluteFilePath(), QDir::AllEntries | QDir::NoDotAndDotDot); + while(it.hasNext()){ + QFileInfo fi = it.next(); mCancelMutex.lock(); if(mCanceled){ mCancelMutex.unlock(); |