From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Wed, 4 Aug 2010 10:53:02 +0000 (+0200)
Subject: Minor xdxf plugin bugs fixed
X-Git-Tag: 0.4~118
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=a8af75450257e73f560cb1ef89164559aec34ce8;p=mdictionary

Minor xdxf plugin bugs fixed
---

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index e712512..6dabac5 100644
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -22,11 +22,12 @@
 // Created by Bartosz Szatkowski
 
 #include "backbone.h"
-
+#include <QDebug>
 Backbone::Backbone(QObject *parent)
     : QObject(parent)
 {
    searchLimitv = 10;
+   loadPlugins();
 }
 
 
@@ -115,7 +116,7 @@ void Backbone::search(QString word) {
 
     foreach(CommonDictInterface* dict, dicts.keys())
         if(dicts[dict] == 1) {
-            dict->search(word, searchLimit());
+            dict->searchWordList(word, searchLimit());
         }
 }
 
@@ -168,9 +169,15 @@ void Backbone::translation(QList<Translation *> trans) {
 
 
 void Backbone::loadPlugins() {
-    QObject *pl = QPluginLoader("xdxf.so").instance();
-    if(!pl)
+    QPluginLoader loader("xdxf.so");
+    if(!loader.load())
+    {
+        qDebug()<<loader.errorString();
         return;
+    }
+    QObject *pl = loader.instance();
+
+    qDebug()<<"loaded";
     CommonDictInterface *plugin = qobject_cast<CommonDictInterface*>(pl);
     plugins.append(plugin);
     addDictionary(plugin);
diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index 6c2d121..9e76657 100644
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -31,7 +31,7 @@ MainWindow::MainWindow(Backbone *backbone, QWidget *parent):
     this->backbone = backbone;
 
     ui->setupUi(this);
-    setAttribute(Qt::WA_Maemo5StackedWindow);
+   // setAttribute(Qt::WA_Maemo5StackedWindow);
 
     searchBarWidget = new SearchBarWidget(backbone);
     wordListWidget = new WordListWidget(backbone);
diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index 711f677..a84ea04 100644
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -29,7 +29,7 @@ TranslationWidget::TranslationWidget(Backbone *backbone, QWidget *parent):
 
     this->backbone = backbone;
 
-    setAttribute(Qt::WA_Maemo5StackedWindow);
+    //setAttribute(Qt::WA_Maemo5StackedWindow);
     setWindowFlags(windowFlags() | Qt::Window);
 
     initializeUI();
diff --git a/trunk/src/includes/CommonDictInterface.h b/trunk/src/includes/CommonDictInterface.h
index e094144..36d079b 100644
--- a/trunk/src/includes/CommonDictInterface.h
+++ b/trunk/src/includes/CommonDictInterface.h
@@ -31,7 +31,6 @@
 #include "translation.h"
 class Settings;
 
-Q_DECLARE_INTERFACE (CommonDictInterface, "xdxfInterface")
 
 //! Interface for dict engines plugins
 class CommonDictInterface : public QObject {
diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfPlugin.pro b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfPlugin.pro
index 90d1a61..3677e33 100644
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfPlugin.pro
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/XdxfPlugin.pro
@@ -8,7 +8,7 @@ QT       += core xml gui
 
 
 TARGET = XdxfPlugin
-TEMPLATE = app
+TEMPLATE = lib
 
 SOURCES +=  \
     xdxfplugin.cpp \
diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index d2f8a4b..cd24b64 100644
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@ -2,6 +2,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QXmlStreamReader>
+#include <QtPlugin>
 
 XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                     _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
@@ -119,3 +120,4 @@ bool XdxfPlugin::isAvailable() const {
     return true;
 }
 
+Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)