1 files changed, 9 insertions, 21 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index ed67abf..55a716d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -23,68 +23,59 @@
 #include <qstringlist.h>
 #include <qregexp.h>
 
 DingWidget::DingWidget( )
 {
 	methodname = QString::null;
 	trenner = QString::null;
 	lines = 0L;
 }
 
 void DingWidget::loadDict( QString name )
 {
-	qDebug( "bin in DingWidget::loadDict(). name ist:" );
-	qDebug( name );
+	lines.clear(); //as we will load a new list we have to
+	               //remove the old one
+	qDebug( "DingWidget::loadDict( ... )" );
 	
-	dictName = name;
 	Config cfg(  "odict" );
-	if ( !methodname ) { return; }
-	cfg.setGroup( "Method_" + methodname );
+	cfg.setGroup( "Method_" + name );
 	QFile file( cfg.readEntry( "file" )  );
 
-	qDebug( cfg.readEntry( "file" ) );
-	
 	if(  file.open(  IO_ReadOnly ) )
 	{
 		QTextStream stream(  &file );
 		while ( !stream.eof() )
 		{
 			lines.append(  stream.readLine() );
 		}
 		file.close();
 	}
 	loadValues();
-
 }
 
 QString DingWidget::loadedDict() const
 { 
 	return dictName;
 }
 
 void DingWidget::setCaseSensitive( bool caseS )
 {
 	isCaseSensitive = caseS;
 }
 
 void DingWidget::setDict( QString dict )
 {
 	methodname = dict;
 }
 
-void DingWidget::setCompleteWord( bool cword )
-{
-	isCompleteWord = cword;
-}
-
 void DingWidget::setQueryWord( QString qword )
 {
 	queryword = qword;
 }
 
 
 void DingWidget::loadValues()
 {
 	if ( !methodname ) return;
 	Config cfg(  "odict" );
 	cfg.setGroup( "Method_" + methodname );
 	trenner = cfg.readEntry( "Seperator" );
@@ -92,33 +83,29 @@ void DingWidget::loadValues()
 	lang2_name = cfg.readEntry( "Lang2" );
 }
 
 BroswerContent DingWidget::setText( QString word )
 {
 	queryword = word;
 	return parseInfo();
 }
 
 
 BroswerContent DingWidget::parseInfo()
 {
-	qDebug( "bin in DingWidget::parseInfo()" );
-
-	if ( isCompleteWord ) 
-		queryword = " " + queryword + " ";
 	QStringList search = lines.grep( queryword , isCaseSensitive );
 
- 	QString current;
- 	QString left;
- 	QString right;
+	QString current;
+	QString left;
+	QString right;
 	QRegExp reg_div( trenner );
 	QRegExp reg_word( queryword );
 	reg_word.setCaseSensitive( isCaseSensitive );
 	QStringList toplist, bottomlist;
 	QString substitute = "<strong>"+queryword+"</strong>";
 
 	for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
 	{
 		current = *it;
 		left = current.left( current.find( trenner ) );
  		
 		right = current.right( current.length() - current.find(trenner) - trenner.length() );
@@ -130,15 +117,16 @@ BroswerContent DingWidget::parseInfo()
 			toplist.append( left );
 		}
 		else
 		{
 			right.replace( queryword, substitute );
 			right = right + " --> " + left;
 			bottomlist.append( right );
 		}
 	}
 
 	s_strings.top = toplist.join( "<br>" );
 	s_strings.bottom = bottomlist.join( "<br>" );
-
+	
 	return s_strings;
 }
+