From 66e89dc42bff22b077f02796683c579ba51f1e5a Mon Sep 17 00:00:00 2001
From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Thu, 26 Aug 2010 11:11:47 +0200
Subject: [PATCH] Fixed #6261 (bookmarks dont work when searching in bookmarks
 disabled)

---
 trunk/src/base/backbone/backbone.h               |    8 +++-----
 trunk/src/base/gui/MainWindow.cpp                |    1 -
 trunk/src/base/gui/WordListWidget.cpp            |    2 --
 trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp |    1 -
 trunk/src/plugins/xdxf/src/xdxfplugin.cpp        |    1 -
 trunk/tests/mDictionaryTests/tst_Backbone.cpp    |    3 ---
 6 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h
index 9d50aa0..95f1620 100644
--- a/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@ -226,11 +226,9 @@ public Q_SLOTS:
         dictFin = 1;
         bookmarkFin = 0;
 
-        if(_searchBookmarks) {
-           _innerBookmarks = QtConcurrent::run(_bookmarks,
-                   &Bookmarks::list);
-           _bookmarkSearchWatcher.setFuture(_innerBookmarks);
-        }
+        _innerBookmarks = QtConcurrent::run(_bookmarks,
+                &Bookmarks::list);
+        _bookmarkSearchWatcher.setFuture(_innerBookmarks);
    }
 
 
diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index bd58ab0..4f73d2b 100644
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -341,7 +341,6 @@ void MainWindow::showNotify(Notify::NotifyType type, QString text) {
         break;
 
     case Notify::Warning:
-        qDebug() << text;
         #ifndef Q_WS_MAEMO_5
                 QMessageBox::warning(this, "Warning", text);
                 break;
diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp
index a753588..fba6b63 100644
--- a/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@ -92,7 +92,6 @@ void WordListWidget::showSearchResults(
         QHash<QString, QList<Translation *> > result) {
 
     clear();
-    qDebug()<<searchResult.count();
     searchResult = result;
 
 
@@ -111,7 +110,6 @@ void WordListWidget::showSearchResults(
 
 void WordListWidget::wordClicked(QModelIndex index) {
     //we're getting translation based on data in index
-    qDebug()<<searchResult[index.data().toString()].at(0)->dictionaryInfo();
     emit showTranslation(
             searchResult[index.data().toString()]);
 }
diff --git a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
index 48e6c11..f6fd9a6 100644
--- a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
@@ -61,7 +61,6 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) :
 }
 
 void XdxfCachingDialog::updateCachingProgress(int progress, int time) {
-    qDebug() << "INININININININI";
     cachingProgressBar->setValue(progress);
 
     if(!cachingLabel->isVisible())
diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 0cac66b..4ed34dd 100644
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -522,7 +522,6 @@ bool XdxfPlugin::makeCache(QString dir) {
             counter++;
             int prog = counter*100/_wordsCount;
             if(prog % 5 == 0 && lastProg != prog) {
-                qDebug() << prog;
                 Q_EMIT updateCachingProgress(prog,
                                              timer.restart());
                 lastProg = prog;
diff --git a/trunk/tests/mDictionaryTests/tst_Backbone.cpp b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
index a29199c..171c2d7 100644
--- a/trunk/tests/mDictionaryTests/tst_Backbone.cpp
+++ b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
@@ -79,7 +79,6 @@ void BackboneTest::init()
         cd->typev = QString("type%1").arg(i);
     }
     back = new Backbone("empty","empty", 1);
-    qDebug() << back->getDictionaries().size();
     addDicts();
 }
 
@@ -173,13 +172,11 @@ void BackboneTest::searchTest() {
         QCOMPARE(m->stopped, 1);
     }
 
-    qDebug() << "main search " << this->thread()->currentThreadId();
     QString list("pigwa");
     back->_searchBookmarks = 0;
     back->_searchDicts = 1;
 
     back->search(list);
-    qDebug() << back->activeDicts().size() << "!!!!!!!!!!!!!";
 
 
     for(int i = 0; i < total; i++) {
-- 
1.7.9.5