From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Wed, 6 Oct 2010 08:06:41 +0000 (+0200)
Subject: Fixed some methods name missmatch
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=b1320c5025934d9127fefa0c1a195b4ecc26ac5b;p=mdictionary

Fixed some methods name missmatch
---

diff --git a/src/plugins/stardict/StarDictPlugin.cpp b/src/plugins/stardict/StarDictPlugin.cpp
index 8685766..452f9f5 100644
--- a/src/plugins/stardict/StarDictPlugin.cpp
+++ b/src/plugins/stardict/StarDictPlugin.cpp
@@ -144,21 +144,6 @@ QString StarDictPlugin::search(QString key) {
     return "";
 }
 
-void StarDictPlugin::parseIfoFile() {
-    QFile file(settings()->value("path"));
-    if (!file.open(QIODevice::ReadOnly)) {
-        // TODO notification
-        return ;
-    }
-    QTextStream in(&file);
-    while (!in.atEnd()) {
-        QString line = in.readLine();
-        QStringList list = line.split("=");
-        if(list.size() == 2) {
-            settings()->setValue(list.at(0),list.at(1));
-        }
-    }
-}
 
 
 void StarDictPlugin::stop() {
@@ -222,16 +207,25 @@ bool StarDictPlugin::setSettings(const Settings *settings) {
 
 
 bool StarDictPlugin::getDictionaryInfo() {
-    QFile dictionaryFile(_settings->value("path"));
-    if(!QFile::exists(_settings->value("path"))
-                || !dictionaryFile.open(QFile::ReadOnly | QFile::Text)) {
+    QFile file(settings()->value("ifoFileName"));
+    if(!QFile::exists(_settings->value("ifoFileName"))
+                || !file.open(QFile::ReadOnly | QFile::Text)) {
        Q_EMIT notify(Notify::Warning,
                QString(tr("StarDict dictionary cannot be read from file")));
         qDebug()<<"Error: could not open the file";
         return false;
     }
 
-    return false;
+    QTextStream in(&file);
+    while (!in.atEnd()) {
+        QString line = in.readLine();
+        QStringList list = line.split("=");
+        if(list.size() == 2) {
+            settings()->setValue(list.at(0),list.at(1));
+        }
+    }
+
+    return true;
 }
 
 
diff --git a/src/plugins/stardict/StarDictPlugin.h b/src/plugins/stardict/StarDictPlugin.h
index c712fa0..65c4e02 100644
--- a/src/plugins/stardict/StarDictPlugin.h
+++ b/src/plugins/stardict/StarDictPlugin.h
@@ -93,9 +93,6 @@ public:
     //! Sets new settings
     bool setSettings(const Settings*);
 
-    //! \return object containing data parsed from .ifo file
-    void parseIfoFile();
-
     //! \returns plugin icon
     QIcon* icon();