Merge from BRANCH_1_0

1 files changed, 1 insertions, 11 deletions

diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 2028701..010545e 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -43,3 +43,3 @@ ODict::ODict() : QMainWindow()
         vbox = new QVBox( this );
-        setCaption( tr( "OPIE-Dictionary" ) );
+        setCaption( tr( "Opie-Dictionary" ) );
         setupMenus();
@@ -78,3 +78,2 @@ void ODict::loadConfig()
         casesens = cfg.readEntry( "casesens" ).toInt();
-        regexp = cfg.readEntry( "regexp" ).toInt();
 
@@ -129,3 +128,2 @@ void ODict::saveConfig()
         cfg.writeEntry( "casesens" , casesens );
-        cfg.writeEntry( "regexp" , regexp );
         cfg.writeEntry( "lastdict" , query_co->currentText() );
@@ -187,9 +185,2 @@ void ODict::slotSetParameter( int count )
 
-         if ( count == 1 )
-        {
-                if ( regexp )
-                        regexp = false;
-                else
-                        regexp = true;
-        }
         saveConfig();
@@ -224,3 +215,2 @@ void ODict::setupMenus()
         parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 );
-        parameter->insertItem( tr( "Allow &reg. expressions" ), 2 );
         parameter->insertSeparator();