summaryrefslogtreecommitdiffstats
path: root/smdirwatcher.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-08-30 15:57:07 +0200
committerArno <am@disconnect.de>2013-08-30 15:57:07 +0200
commit3f0a819948d36d06f1ddf07e5a51ff771ddda4da (patch)
tree0c69d4de4ff173b658f4cc514f1dcda1d19a2f9b /smdirwatcher.cpp
parent2cc92200386c55818cbe9bcb7d2e488170317d70 (diff)
downloadSheMov-3f0a819948d36d06f1ddf07e5a51ff771ddda4da.tar.gz
SheMov-3f0a819948d36d06f1ddf07e5a51ff771ddda4da.tar.bz2
SheMov-3f0a819948d36d06f1ddf07e5a51ff771ddda4da.zip
Revert "Don't show progress dialog when we're polling"
This reverts commit 2cc92200386c55818cbe9bcb7d2e488170317d70. Wrong, non-working solution for this problem.
Diffstat (limited to 'smdirwatcher.cpp')
-rw-r--r--smdirwatcher.cpp10
1 files changed, 3 insertions, 7 deletions
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;
}