From 3f0a819948d36d06f1ddf07e5a51ff771ddda4da Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 30 Aug 2013 15:57:07 +0200 Subject: Revert "Don't show progress dialog when we're polling" This reverts commit 2cc92200386c55818cbe9bcb7d2e488170317d70. Wrong, non-working solution for this problem. --- smdirwatcher.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'smdirwatcher.cpp') diff --git a/smdirwatcher.cpp b/smdirwatcher.cpp index 9c4fb81..2b03179 100644 --- a/smdirwatcher.cpp +++ b/smdirwatcher.cpp @@ -103,7 +103,7 @@ void SmDirWatcher::stop(){ quit(); } -SmDataColletor::SmDataColletor(const int numFields, QObject *parent) : QThread(parent), mSemFree(0), mSemUsed(0), mDataQueue(0), mNumFields(numFields), mCheckForPresent(true), mCancel(false), mShowProgress(false) { +SmDataColletor::SmDataColletor(const int numFields, QObject *parent) : QThread(parent), mSemFree(0), mSemUsed(0), mDataQueue(0), mNumFields(numFields), mCheckForPresent(true), mCancel(false) { QSqlDatabase db = QSqlDatabase::cloneDatabase(QSqlDatabase::database("treedb"), "collectordb"); db.open(); mPicPresentQ = new QSqlQuery(db); @@ -154,13 +154,9 @@ void SmDataColletor::run(){ SmTreeItem * SmDataColletor::populate(const QString &dir){ SmTreeItem *retval = new SmTreeItem(mNumFields); QDir d = QDir(dir); - if(mShowProgress){ - emit totalFiles(d.entryInfoList().size()); - } + emit totalFiles(d.entryInfoList().size()); foreach(QFileInfo fi, d.entryInfoList()){ - if(mShowProgress){ - emit progress(); - } + emit progress(); if(fi.fileName() == "."){ continue; } -- cgit v1.2.3-70-g09d2