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
@@ -37,2 +37,3 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br
 	trenner = QString::null;
+	lines = 0L;
 	loadValues();
@@ -40,3 +41,2 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br
 	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
-	QStringList lines;
 	
@@ -54,6 +54,14 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br
 
+	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 );
 }
@@ -78,6 +86,4 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
 	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>";
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
@@ -13,2 +13,4 @@ class QStringList;
 
+#include <qstringlist.h>
+
 #include <qstring.h>
@@ -20,2 +22,4 @@ class DingWidget
 
+		void setText();
+		QStringList lines;
 	private:
@@ -27,2 +31,4 @@ class DingWidget
 		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
@@ -100,9 +100,10 @@ void ODict::slotStartQuery()
 	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();
 }