2 files changed, 16 insertions, 24 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,5 +847,2 @@ bool Gutenbrowser::load( const char *fileName) {
 void Gutenbrowser::Search() {
-
-                        //    if( searchDlg->isHidden())
-                {
                                 odebug << "Starting search dialog" << oendl;
@@ -853,3 +850,2 @@ void Gutenbrowser::Search() {
                                 searchDlg->setCaption( tr( "Etext Search" ));
-                                        //        searchDlg->setLabel( "- searches etext");
                                 connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
@@ -861,4 +857,2 @@ void Gutenbrowser::Search() {
                                 searchDlg->show();
-                                searchDlg->result();
-                }
 }
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
@@ -198,3 +198,3 @@ HelpWindow::~HelpWindow()
     QFile f( QDir::currentDirPath() + "/.history" );
-    f.open( IO_WriteOnly );
+    if ( f.open( IO_WriteOnly ) ) {
     QDataStream s( &f );
@@ -202,2 +202,3 @@ HelpWindow::~HelpWindow()
     f.close();
+    }
 
@@ -209,3 +210,5 @@ HelpWindow::~HelpWindow()
     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,5 +287,9 @@ void HelpWindow::readHistory()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.history" ) )
+        return;
+
   QFile f( QDir::currentDirPath() + "/.history" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
+
   QDataStream s( &f );
@@ -303,3 +300,2 @@ void HelpWindow::readHistory()
     }
-}
 
@@ -307,5 +303,8 @@ void HelpWindow::readBookmarks()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) )
+        return;
+
   QFile f( QDir::currentDirPath() + "/.bookmarks" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
   QDataStream s( &f );
@@ -314,3 +313,2 @@ void HelpWindow::readBookmarks()
     }
-}