Xdxf plugin dict parsing fixed

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

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index c0803f4..9be3804 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -116,7 +116,7 @@ void Backbone::search(QString word) {
 
     foreach(CommonDictInterface* dict, dicts.keys())
         if(dicts[dict] == 1) {
-            translation(dict->search(word, searchLimit()));
+            translation(dict->searchWordList(word, searchLimit()));
         }
 }
 
@@ -136,15 +136,11 @@ void Backbone::search(QString word) {
 
  void Backbone::addDictionary(CommonDictInterface* dict) {
      dicts[dict] = 1;
-<<<<<<< HEAD
-     connect(dict, SIGNAL(finalTranslation(QList<Translation*>)),
-             this, SLOT(translation(QList<Translation*>)),
-             Qt::QueuedConnection);
-=======
+
      //connect(dict, SIGNAL(finalTranslation()),
       //       this, SLOT(translation()),
       //       Qt::UniqueConnection);
->>>>>>> 22b7c270de4fcb536e0325485e69952ea88ebff7
+
  }