From: Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Date: Wed, 15 Sep 2010 08:44:12 +0000 (+0200)
Subject: Merge branch 'master' into google
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=ae4c4b50e14b5c30b3e66e08c98094b97671890f;p=mdictionary

Merge branch 'master' into google
---

ae4c4b50e14b5c30b3e66e08c98094b97671890f
diff --cc src/include/translation.h
index bfcf326,bc24bac..2d7407e
--- a/src/include/translation.h
+++ b/src/include/translation.h
@@@ -51,11 -51,11 +51,11 @@@ class Translation 
          return this->key()==translation->key();
      }
  
 -    //! \return parsed raw format into html
 -    virtual QString toHtml() const = 0;
 +    //! \return parsed raw format into xml
 +    virtual QString toXml() const = 0;
  
      //! \return whether given translation is taken from bookmarks
-     virtual bool isBookmark() const {
+     virtual int isBookmark() const {
          return _bookmark;
     }
  
diff --cc src/mdictionary/backbone/Bookmarks.cpp
index e046157,5583368..a2f55c8
--- a/src/mdictionary/backbone/Bookmarks.cpp
+++ b/src/mdictionary/backbone/Bookmarks.cpp
@@@ -68,9 -66,8 +66,8 @@@ void Bookmarks::add(Translation* transl
      cur.prepare("insert into bookmarks values (?,?,?)");
      cur.addBindValue(translation->key());
      cur.addBindValue(removeAccents(translation->key()));
 -    cur.addBindValue(translation->toHtml());
 +    cur.addBindValue(translation->toXml());
      cur.exec();
-     db.close();
  }