ok, now we have no more memleaks (I valgrind'ed and gdb'ed) and some more

feature are working.

3 files changed, 24 insertions, 11 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 6154d68..2913836 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -35,10 +35,10 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br
         methodname = activated_name;
         queryword = word;
         trenner = QString::null;
+        lines = 0L;
         loadValues();
           QString opie_dir = getenv("OPIEDIR");
         QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
-        QStringList lines;
         
         if(  file.open(  IO_ReadOnly ) )
         {
@@ -52,10 +52,18 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br
 
         lines = lines.grep( queryword );
 
+        topbrowser = browser_top;
+        bottombrowser = browser_bottom;
+}
+
+void DingWidget::setText()
+{
         QString top, bottom;
-        parseInfo( lines, top , bottom );
-        browser_top->setText( top );
-        browser_bottom->setText( bottom );
+        QStringList test = lines;
+        parseInfo( test, top , bottom );
+        
+        topbrowser->setText( top );
+        bottombrowser->setText( bottom );
 }
 
 void DingWidget::loadValues()
@@ -76,10 +84,8 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
         QString html_table_left  = "<tr><td width='50'>";
         QString html_table_sep   = "</td><td>";
         QString html_table_right = "</td></tr>";
-        QRegExp reg_div( "\\" );
-        //QRegExp reg_div( trenner );
+        QRegExp reg_div( trenner );
         QRegExp reg_word( queryword );
-        //QString substitute = "<font color=red>"+queryword+"</font>";
         QString substitute = "<a href=''>"+queryword+"</a>";
         QStringList toplist, bottomlist;
         for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index 1cedb4e..c96039f 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -11,6 +11,8 @@ class QString;
 class QTextBrowser;
 class QStringList;
 
+#include <qstringlist.h>
+
 #include <qstring.h>
 
 class DingWidget
@@ -18,6 +20,8 @@ class DingWidget
     public:
                 DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
 
+                void setText();
+                QStringList lines;
         private:
                 QString search_word;
                 void parseInfo( QStringList& , QString&, QString& );
@@ -25,4 +29,6 @@ class DingWidget
                 void loadValues();
                 QString methodname;
                 QString trenner;
+                
+                QTextBrowser *topbrowser, *bottombrowser;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index e0104eb..6f176f9 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -98,13 +98,14 @@ void ODict::slotStartQuery()
         QString querystring = query_le->text();
         qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
         if (querystring.isEmpty()){
-          qWarning("empty querystring");
-          return;
+                qWarning("empty querystring");
+                return;
         }
         if (!activated_name || activated_name.isEmpty())
-          QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
+                QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
         else
-          DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
+                DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
+                ding->setText();
 }