Merge branch 'master' into google

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

diff --git a/src/mdictionary/backbone/Bookmarks.h b/src/mdictionary/backbone/Bookmarks.h
index 3172377..74e4721 100644 (file)
--- a/src/mdictionary/backbone/Bookmarks.h
+++ b/src/mdictionary/backbone/Bookmarks.h
@@ -97,11 +97,11 @@ public:
     bool inBookmarks(QString word);
 
 private:
-    bool checkAndCreateDb();
+    bool checkAndCreateDb(QString dbName = "");
 
     
     QString dbName;
-    QSqlDatabase getDbCnx(QString dbName);
+    QSqlDatabase getDbCnx();
     QMap<QChar, QRegExp> letters;
     QRegExp noLetter;
     QSqlDatabase mdb;