diff options
Diffstat (limited to 'consistencycheck.cpp')
| -rw-r--r-- | consistencycheck.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/consistencycheck.cpp b/consistencycheck.cpp index d5d1aa8..3bbd871 100644 --- a/consistencycheck.cpp +++ b/consistencycheck.cpp @@ -12,7 +12,6 @@ #include <QtWidgets/QVBoxLayout> #include <QSqlQuery> #include <QFileInfo> -#include <QSignalMapper> #include <QTextCursor> #include <QMutexLocker> #include <QMutex> @@ -62,7 +61,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); }); mCheckFs = new QPushButton(tr("Check Filesystem")); + connect(mCheckFs, &QPushButton::clicked, [=] { startChecker(ConsistencyCheck::FsCheck); }); mCleanup = new QPushButton(tr("Cleanup...")); connect(mCleanup, SIGNAL(clicked()), this, SLOT(cleanup())); mCleanup->setEnabled(false); @@ -74,17 +75,9 @@ ConsistencyCheck::ConsistencyCheck(QWidget *parent, Qt::WindowFlags f) : SmDialo buttonLayout->addWidget(mCancelExit); connect(mCancelExit, SIGNAL(clicked()), this, SLOT(accept())); - // signal mapper - QSignalMapper *mapper = new QSignalMapper(this); - connect(mCheckDb, SIGNAL(clicked()), mapper, SLOT(map())); - mapper->setMapping(mCheckDb, ConsistencyCheck::DbCheck); - connect(mCheckFs, SIGNAL(clicked()), mapper, SLOT(map())); - mapper->setMapping(mCheckFs, ConsistencyCheck::FsCheck); - connect(mapper, SIGNAL(mapped(int)), this, SLOT(startChecker(int))); - //misc - mChecker = new ConsistencyChecker(this); - connect(mChecker, SIGNAL(started()), this, SLOT(checkerStarted())); + 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))); |