Merged with master

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

diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h
index 0ee15cf..4302e26 100644 (file)
--- a/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@ -53,9 +53,9 @@ class Backbone : public QObject
     Q_OBJECT
 
 public:
-    Backbone(QObject *parent = 0);
-    //! \param pluginPath path to plugins
-    Backbone(QString pluginPath, QObject *parent = 0);
+    /*!\param pluginPath path to plugins (leave blank for default)
+      \param configPath path to folder with configuration files*/
+    Backbone(QString pluginPath="", QString configPath="", QObject *parent = 0);
     ~Backbone();
     Backbone(const Backbone& b);
 
@@ -125,7 +125,6 @@ Q_SIGNALS:
 
 
 private:
-    void loadPlugins(); //< locate and load plugins
     QHash<CommonDictInterface*, bool> _dicts;
     QList<CommonDictInterface*> _plugins;
     QList<QFuture<QList<Translation*> > > _innerResult;
@@ -136,8 +135,13 @@ private:
     QTime _time;
     int _interval; //Search fetching timer.timeout interval in msec
     QString _pluginPath;
+    QString _configPath;
 
     void init();
+    QStringList getFilesFromDir(QString dir, QStringList nameFilter);
+    void loadPlugins(); //< locate and load plugins
+    void loadDict();
+    //void writeConfig(QString key, QString value);
 
 };