Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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

diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h
index 749b8de..74a3737 100644 (file)
--- a/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@ -156,22 +156,25 @@ private:
     QStringList _htmlResult;
     QTimer _timerSearch, _timerHtmlSearch;
     QTime _time;
-    QString _pluginPath;
+    QString _pluginPath, _defaultPluginPath;
     QString _configPath;
-    int _searchLimit;
+    QString _defaultConfigPath;
+    int _searchLimit, _defaultSearchLimit;
     int _activeSearchNum;
     int _interval; //Search fetching timer.timeout interval in msec
-    int _historyLen;
+    int _historyLen, _defaultHistoryLen;
+    bool dryRun;
 
     void init();
     QStringList getFilesFromDir(QString dir, QStringList nameFilter);
     void loadPlugins(); //< locate and load plugins
-    void loadPrefs();
-    void loadDicts();
+    void loadPrefs(QString fileName);
+    void loadDicts(QString fileName, bool _default=false);
     void saveState(QSettings*, Settings*, bool, uint);
-    CommonDictInterface* plugin(QString type); //< search for given type plugin
     void addInternalDictionary(CommonDictInterface*, bool);
-    //void writeConfig(QString key, QString value);
+    void savePrefs(QSettings*);
+    void saveDefaultPrefs(QSettings*);
+    CommonDictInterface* plugin(QString type); //< search for given type plugin
 
     History* _history;