Fixed tests: some modification in runtime order

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index b206fb0..97b8857 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -44,7 +44,6 @@ public:
 
 void Backbone::init() {
    _interval = 250; //msec
-   dryRun = false;
 
    if(!_configPath.size())
        _configPath = QDir::homePath() + "/.mdictionary/mdictionary.config";
@@ -80,9 +79,10 @@ Backbone::Backbone(QString pluginPath, QString configPath, bool dry,
     _pluginPath = pluginPath;
     _configPath = configPath;
     _defaultConfigPath = configPath;
-    init();
+    dryRun = false;
     if(dry)
         dryRun = true;
+    init();
 }
 
 

diff --git a/trunk/src/base/gui/DictManagerWidget.cpp b/trunk/src/base/gui/DictManagerWidget.cpp
index 136dc56..d4b450b 100644 (file)
--- a/trunk/src/base/gui/DictManagerWidget.cpp
+++ b/trunk/src/base/gui/DictManagerWidget.cpp
@@ -99,7 +99,7 @@ void DictManagerWidget::refreshDictsList() {
         else {
             item->setCheckState(Qt::Unchecked);
         }
-        item->setIcon(i.key()->icon());
+        item->setIcon(*i.key()->icon());
 
         dictListWidget->addItem(item);
         dictsHash.insert(item, i.key());

diff --git a/trunk/src/includes/CommonDictInterface.h b/trunk/src/includes/CommonDictInterface.h
index b709454..596220e 100644 (file)
--- a/trunk/src/includes/CommonDictInterface.h
+++ b/trunk/src/includes/CommonDictInterface.h
@@ -83,7 +83,7 @@ class CommonDictInterface : public QObject {
     virtual Settings* settings() = 0;
 
     //! returns plugin icon
-    virtual QIcon icon() = 0;
+    virtual QIcon* icon() = 0;
 
  public Q_SLOTS:
     /*! performs search in dictionary

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 058e95b..f5d73d0 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -269,8 +269,8 @@ QString XdxfPlugin::removeAccents(QString string) {
     return normalized;
 }
 
-QIcon XdxfPlugin::icon() {
-    return _icon;
+QIcon* XdxfPlugin::icon() {
+    return &_icon;
 }
 
 Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.h b/trunk/src/plugins/xdxf/src/xdxfplugin.h
index 7d0cd93..70998f1 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.h
@@ -84,7 +84,7 @@ public:
     void setSettings(Settings*);
 
     //! returns plugin icon
-    virtual QIcon icon();
+    virtual QIcon* icon();
 
 public Q_SLOTS:
     /*! performs search in dictionary

diff --git a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
index 540e85c..2e924e2 100644 (file)
--- a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
+++ b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
@@ -57,7 +57,7 @@ public:
     uint hash() const { return _hash;}
     void setHash(uint h) {_hash = h;}
     void stop() {stopped = 1;}
-    QIcon icon(){return QIcon();}
+    QIcon* icon(){return 0;}
     QString search(QString key) {return "";}
     QList<Translation*> searchWordList(QString word, int limit) {
         qDebug() << "search " << this->thread()->currentThreadId();

diff --git a/trunk/tests/mDictionaryTests/tst_Backbone.cpp b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
index 9f4f798..a97bd6a 100644 (file)
--- a/trunk/tests/mDictionaryTests/tst_Backbone.cpp
+++ b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
@@ -63,6 +63,7 @@ BackboneTest::BackboneTest()
     total = 5;
     for(int i = 0; i < total; i++)
         dict.push_back(new CommonDictInterfaceMock());
+    QApplication app(0, 0);
 }