From 4c7a5b8be8948838e7d511d71a9baccb5814a0cc Mon Sep 17 00:00:00 2001
From: Piotrek <ppilar11@gmail.com>
Date: Wed, 4 Aug 2010 14:11:43 +0200
Subject: [PATCH] changed the return value of searchWordList function

---
 trunk/src/includes/CommonDictInterface.h           |    6 ++++--
 .../plugins/xdxf/src/XdxfPlugin/TranslationXdxf.h  |    3 +++
 .../src/plugins/xdxf/src/XdxfPlugin/XdxfPlugin.pro |    2 +-
 .../src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp |    8 +++++---
 trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h |    5 +++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/trunk/src/includes/CommonDictInterface.h b/trunk/src/includes/CommonDictInterface.h
index e094144..57a8c92 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 {
@@ -82,7 +81,7 @@ class CommonDictInterface : public QObject {
         \see CommonDictInterface:finalTranslation  finalTranslation
 
     */
-    virtual void searchWordList(QString word, int limit) = 0;
+    virtual QList<Translation*> searchWordList(QString word, int limit) = 0;
 
     //! stop current operation
     virtual void stop() = 0;
@@ -91,6 +90,9 @@ class CommonDictInterface : public QObject {
     //! emit list of found Translations
     void finalTranslation(QList<Translation*>);
 
+    //! emits signal informing that search is complete
+    void finalTranslation();
+
     //! emited after dictionary is ready to use afer being loaded
     void loaded(CommonDictInterface*);
 };
diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/TranslationXdxf.h b/trunk/src/plugins/xdxf/src/XdxfPlugin/TranslationXdxf.h
index 2df2965..14ba317 100644
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/TranslationXdxf.h
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/TranslationXdxf.h
@@ -23,7 +23,10 @@ public:
     //! \return parsed raw format into html
     QString toHtml() const;
 
+    //! sets the word for which we want to find a translation
     void setKey(QString);
+
+    //! sets information about dictionary
     void setDictionaryInfo(QString);
 
 
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 465c62f..4fe57f1 100644
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@ -29,13 +29,14 @@ QString XdxfPlugin::infoNote() const {
     return  _infoNote;
 }
 
-void XdxfPlugin::searchWordList(QString word, int limit) {
+QList<Translation*> XdxfPlugin::searchWordList(QString word, int limit) {
     QRegExp regWord(word);
     QList<Translation*> translations;
     regWord.setPatternSyntax(QRegExp::Wildcard);
     QFile dictionaryFile(path);
     if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) {
-        return; //blad otwarcia pliku
+        qDebug()<<"Error: could not open file";
+        return translations;
     }
     QXmlStreamReader dictionaryReader(&dictionaryFile);
     dictionaryReader.readNextStartElement();
@@ -68,8 +69,9 @@ void XdxfPlugin::searchWordList(QString word, int limit) {
         }
     }
     stopped=false;
-    emit finalTranslation(translations);
     dictionaryFile.close();
+    emit finalTranslation();
+    return translations;
 }
 
 QString XdxfPlugin::search(QString key) {
diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
index 324bf92..07e462a 100644
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
@@ -42,8 +42,10 @@ public:
     //! returns whether plugin can start searching
     bool isAvailable() const;
 
+    //! returns a description of a word given by a QString
     QString search(QString key);
 
+    //! returns a unique hash for a dictionary
     uint hash() const;
 
 public Q_SLOTS:
@@ -54,8 +56,7 @@ public Q_SLOTS:
       After finishing search it have to emit
       \see CommonDictInterface:finalTranslation  finalTranslation
     */
-
-    void searchWordList(QString word, int limit);
+    QList<Translation*> searchWordList(QString word, int limit);
 
     //! stop current operation
     void stop();
-- 
1.7.9.5