Unifying modules

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index 6dabac5..ec9fc4f 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -138,7 +138,7 @@ void Backbone::search(QString word) {
      dicts[dict] = 1;
      connect(dict, SIGNAL(finalTranslation(QList<Translation*>)),
              this, SLOT(translation(QList<Translation*>)),
-             Qt::UniqueConnection);
+             Qt::QueuedConnection);
  }
 
 
@@ -159,7 +159,10 @@ int Backbone::activeSearches() const {
 void Backbone::translation(QList<Translation *> trans) {
     activeSearchNum--;
     foreach(Translation* t, trans)
+    {
         _result.insert(t->key(), t);
+        qDebug()<<t->key();
+    }
 
     if(activeSearchNum < 1)
         Q_EMIT ready();

diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp
index 24f1706..058d732 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@ -31,6 +31,9 @@ WordListWidget::WordListWidget(Backbone *backbone, QWidget *parent):
 
     wordListModel = new QStringListModel();
 
+    connect(backbone, SIGNAL(ready()),
+            this, SLOT(showSearchResults()));
+
     setModel(wordListModel);
 }
 

diff --git a/trunk/src/base/gui/main.cpp b/trunk/src/base/gui/main.cpp
index 892893d..aa088bb 100644 (file)
--- a/trunk/src/base/gui/main.cpp
+++ b/trunk/src/base/gui/main.cpp
@@ -24,10 +24,14 @@
 #include <QtGui/QApplication>
 #include "MainWindow.h"
 #include "../backbone/backbone.h"
+#include "../../includes/translation.h"
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
+
+    qRegisterMetaType<Translation*>("Translation*");
+    qRegisterMetaType<QList<Translation*> >("QList<Translation*>");
     Backbone* backbone = new Backbone;
     MainWindow* w = new MainWindow(backbone);
     w->show();

diff --git a/trunk/src/includes/translation.h b/trunk/src/includes/translation.h
index e3f46ee..3476947 100644 (file)
--- a/trunk/src/includes/translation.h
+++ b/trunk/src/includes/translation.h
@@ -43,5 +43,6 @@ class Translation {
 };
 
 Q_DECLARE_METATYPE(Translation*);
+Q_DECLARE_METATYPE(QList<Translation*>);
 
 #endif