Fix random error when remove word from bookmark. Fix show all bookmark feature.

[mdictionary] / src / mdictionary / backbone / backbone.h

diff --git a/src/mdictionary/backbone/backbone.h b/src/mdictionary/backbone/backbone.h
index be84df7..f59bc3d 100644 (file)
--- a/src/mdictionary/backbone/backbone.h
+++ b/src/mdictionary/backbone/backbone.h
@@ -42,8 +42,10 @@
 #include <QTime>
 #include <QDir>
 #include <QThread>
+#include <QDebug>
 #include <QSettings>
 #include <QFutureWatcher>
+#include <QMultiMap>
 #include "../../include/CommonDictInterface.h"
 #include "../../include/settings.h"
 #include "../../include/translation.h"
@@ -193,11 +195,7 @@ public Q_SLOTS:
       added to bookmarks data base (key and translation stored in db))
       \param translations list of Translation objects to be stored in db
       */
-    void addBookmark(QList<Translation*> translations) {
-        foreach(Translation* translation, translations)
-            //_bookmarks.add(translation);
-            QtConcurrent::run(_bookmarks, &Bookmarks::add, translation);
-    }
+    void addBookmark(QList<Translation*> translations);
 
 
     /*! Removes bookmarks to given translations
@@ -231,9 +229,10 @@ public Q_SLOTS:
         _innerBookmarks = QtConcurrent::run(_bookmarks,
                 &Bookmarks::list);
         _bookmarkSearchWatcher.setFuture(_innerBookmarks);
-   }
-
 
+        Q_EMIT bookmarkMode();
+        qDebug()<<"1";
+   }
 
    /*! Sets settings for backbone: history_size, search_limit,
        searching backends (search_bookmarks, search_dictionaries)
@@ -241,7 +240,6 @@ public Q_SLOTS:
        */
     void setSettings(Settings* settings);
 
-
     /*! \return corresponding settings object with history_size, search_limit,
        searching backends (search_bookmarks, search_dictionaries)
        */
@@ -276,6 +274,10 @@ Q_SIGNALS:
     */
     void notify(Notify::NotifyType, QString);
 
+    void bookmarkReady();
+
+    void bookmarkMode();
+
 private Q_SLOTS:
     void bookmarksListReady();