From: jakub <jakub.jaszczynski@comarch.com>
Date: Tue, 4 Jan 2011 08:23:50 +0000 (+0100)
Subject: fix bug
X-Git-Url: http://git.maemo.org/git/?p=mdictionary;a=commitdiff_plain;h=f5d6d4c41bd2fb14795308bb0f2edf9b395b75d8

fix bug
---

diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index 721decc..5e77d38 100644
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -588,8 +588,9 @@ void Backbone::xmlTranslationReady() {
 QList<CommonDictInterface*> Backbone::activeDicts() {
     QList<CommonDictInterface*>res;
     foreach(CommonDictInterface* dict, _dicts.keys())
-        if(_dicts[dict])
+        if(_dicts[dict]){
             res.append(dict);
+        }
     return res;
 
 }
diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index e5a0b61..48f3159 100644
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -235,7 +235,6 @@ void MainWindow::wordListReady() {
             setExactSearch(false);
         }
     }
-
     wordListWidget->setFocus();
 }
 
diff --git a/src/mdictionary/gui/SearchBarWidget.cpp b/src/mdictionary/gui/SearchBarWidget.cpp
index 88645b1..95e2543 100644
--- a/src/mdictionary/gui/SearchBarWidget.cpp
+++ b/src/mdictionary/gui/SearchBarWidget.cpp
@@ -97,8 +97,8 @@ SearchBarWidget::SearchBarWidget(QWidget *parent) : QWidget(parent) {
     emit setEnableHistoryPrev(false);
 
     completerModel = new QStringListModel(this);
- //   connect(&delayTimer, SIGNAL(timeout()),
- //           this, SLOT(delaySearchTimeout()));
+    connect(&delayTimer, SIGNAL(timeout()),
+            this, SLOT(delaySearchTimeout()));
 
     view->setFocus();
 
@@ -364,6 +364,7 @@ void SearchBarWidget::setEnabled(bool enabled) {
         historyShowToolButton->setEnabled(false);
     }
 #endif
+qDebug()<<"tu2???";
 }
 
 void SearchBarWidget::setBusy() {
@@ -390,7 +391,7 @@ void SearchBarWidget::setBusy() {
 }
 
 void SearchBarWidget::updateBusyTimer(){
-   // qDebug()<<"test12";
+    qDebug()<<"test12";
     if(progressMax==true){
         emit progresSetValue2(0);
         progressMax=false;
diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index b790af9..6062abc 100644
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -95,7 +95,7 @@ OTHER_FILES += \
     qml/TranslationView.qml \
     qml/FlickableWebView.qml \
     qml/ScrollBar.qml \
-    qml/SpinBox.qml
+    qml/SpinBox.qml \
     qml/Checkbox.qml
 
 target.path = $$BIN_DIR
diff --git a/src/mdictionary/qml/AboutWidget.qml b/src/mdictionary/qml/AboutWidget.qml
index 9821576..92c6d07 100644
--- a/src/mdictionary/qml/AboutWidget.qml
+++ b/src/mdictionary/qml/AboutWidget.qml
@@ -52,10 +52,4 @@ Rectangle {
         anchors.horizontalCenterOffset: 0
         onLinkActivated: linkClicked(link);
     }
-
-    SpinBox{
-        id: test;
-        x:100;
-        y:100;
-    }
 }
diff --git a/src/mdictionary/qml/TranslationView.qml b/src/mdictionary/qml/TranslationView.qml
index 809e4c8..f161c4d 100644
--- a/src/mdictionary/qml/TranslationView.qml
+++ b/src/mdictionary/qml/TranslationView.qml
@@ -10,7 +10,7 @@ Rectangle {
     color: myPalette.window
 
     function setUrl(string){
-        webView.url = "file:///home/test.html";
+        webView.url = "file:///home/jakub/test.html";
         webView.url = string;
     }
 
diff --git a/src/plugins/stardict/CompressedReader.cpp b/src/plugins/stardict/CompressedReader.cpp
index 4943056..59bfaa1 100644
--- a/src/plugins/stardict/CompressedReader.cpp
+++ b/src/plugins/stardict/CompressedReader.cpp
@@ -78,7 +78,10 @@ QChar CompressedReader::readChar() {
     }
 
     cha=QString::fromUtf8(c);
-    return cha.at(0);
+    if(cha.size()!=0)
+        return cha.at(0);
+    else
+        return '\0';
 }
 
 
diff --git a/src/plugins/stardict/UncompressedReader.cpp b/src/plugins/stardict/UncompressedReader.cpp
index 6b75e90..b66693e 100644
--- a/src/plugins/stardict/UncompressedReader.cpp
+++ b/src/plugins/stardict/UncompressedReader.cpp
@@ -63,7 +63,6 @@ void UncompressedReader::close() {
 QChar UncompressedReader::readChar() {
     char c[4]={0};
     QString cha;
-
     _stream.readRawData(c,1);
     if(((unsigned char)c[0])>239)
         _stream.readRawData(c+1,3);
@@ -75,8 +74,10 @@ QChar UncompressedReader::readChar() {
         qDebug()<<"error - starDict - read wordList from UTF-8";
 
     cha=QString::fromUtf8(c);
-
-    return cha.at(0);
+    if(cha.size()!=0)
+        return cha.at(0);
+    else
+        return '\0';
 }
 
 
@@ -84,7 +85,6 @@ QString UncompressedReader::readKeyword() {
     QString result;
     QChar c;
     c = readChar();
-
     while(c != '\0') {
         result += c;
         c = readChar();