2 files changed, 41 insertions, 49 deletions

diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 733db17..8b02f9f 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -847,18 +847,12 @@ bool Gutenbrowser::load( const char *fileName) {
 void Gutenbrowser::Search() {
-
-                        //    if( searchDlg->isHidden())
-                {
-                                odebug << "Starting search dialog" << oendl;
-                                searchDlg = new SearchDialog( this, "Etext Search", true);
-                                searchDlg->setCaption( tr( "Etext Search" ));
-                                        //        searchDlg->setLabel( "- searches etext");
-                                connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
-                                connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
-
-                                QString resultString;
-                                QString string = searchDlg->searchString;
-                                Lview->deselect();
-                                searchDlg->show();
-                                searchDlg->result();
-                }
+        odebug << "Starting search dialog" << oendl;
+        searchDlg = new SearchDialog( this, "Etext Search", true);
+        searchDlg->setCaption( tr( "Etext Search" ));
+        connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
+        connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
+
+        QString resultString;
+        QString string = searchDlg->searchString;
+        Lview->deselect();
+        searchDlg->show();
 }
diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
index 4bdac02..f444a2e 100644
--- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
@@ -195,9 +195,10 @@ HelpWindow::~HelpWindow()
     for ( ; it != mHistory.end(); ++it )
-  history.append( *it );
+        history.append( *it );
 
     QFile f( QDir::currentDirPath() + "/.history" );
-    f.open( IO_WriteOnly );
-    QDataStream s( &f );
-    s << history;
-    f.close();
+    if ( f.open( IO_WriteOnly ) ) {
+        QDataStream s( &f );
+        s << history;
+        f.close();
+    }
 
@@ -206,6 +207,8 @@ HelpWindow::~HelpWindow()
     for ( ; it2 != mBookmarks.end(); ++it2 )
-  bookmarks.append( *it2 );
+        bookmarks.append( *it2 );
 
     QFile f2( QDir::currentDirPath() + "/.bookmarks" );
-    f2.open( IO_WriteOnly );
+    if ( !f2.open( IO_WriteOnly ) )
+        return;
+
     QDataStream s2( &f2 );
@@ -215,12 +218,2 @@ HelpWindow::~HelpWindow()
 
-//  void HelpWindow::about()
-//  {
-//      QMessageBox::about( this, "Gutenbrowser", "<p>Thanks to Trolltech for this</p>" );
-//  }
-
-//  void HelpWindow::aboutQt()
-//  {
-//      QMessageBox::aboutQt( this, "QBrowser" );
-//  }
-
 void HelpWindow::openFile()
@@ -294,11 +287,14 @@ void HelpWindow::readHistory()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
-  QFile f( QDir::currentDirPath() + "/.history" );
-  f.open( IO_ReadOnly );
-  QDataStream s( &f );
-  s >> history;
-  f.close();
-  while ( history.count() > 20 )
-      history.remove( history.begin() );
-    }
+    if ( !QFile::exists( QDir::currentDirPath() + "/.history" ) )
+        return;
+
+    QFile f( QDir::currentDirPath() + "/.history" );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
+
+    QDataStream s( &f );
+    s >> history;
+    f.close();
+    while ( history.count() > 20 )
+        history.remove( history.begin() );
 }
@@ -307,9 +303,11 @@ void HelpWindow::readBookmarks()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
-  QFile f( QDir::currentDirPath() + "/.bookmarks" );
-  f.open( IO_ReadOnly );
-  QDataStream s( &f );
-  s >> bookmarks;
-  f.close();
-    }
+    if ( !QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) )
+        return;
+
+    QFile f( QDir::currentDirPath() + "/.bookmarks" );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
+    QDataStream s( &f );
+    s >> bookmarks;
+    f.close();
 }