Merged with master

[mdictionary] / trunk / tests / mDictionaryTests / CommonDictInterfaceMock.h

diff --git a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
index c627190..ad2fbbc 100644 (file)
--- a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
+++ b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
@@ -51,7 +51,7 @@ public:
     uint hash() const { return _hash;}
     void setHash(uint h) {_hash = h;}
     void stop() {stopped = 1;}
-    QString search(QString key) {}
+    QString search(QString key) {return "";}
     QList<Translation*> searchWordList(QString word, int limit) {
         qDebug() << "search " << this->thread()->currentThreadId();
         stopped = 0;
@@ -67,8 +67,8 @@ public:
 
         return list;
     }
-    DictDialog* dictDialog() {}
-    Settings* settings() {}
+    DictDialog* dictDialog() {return 0;}
+    Settings* settings() {return 0;}
 
 };