1 files changed, 31 insertions, 33 deletions

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
@@ -193,36 +193,29 @@ HelpWindow::~HelpWindow()
     history.clear();
     QMap<int, QString>::Iterator it = mHistory.begin();
     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();
+    }
 
     bookmarks.clear();
     QMap<int, QString>::Iterator it2 = mBookmarks.begin();
     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 );
     s2 << bookmarks;
     f2.close();
 }
 
-//  void HelpWindow::about()
-//  {
-//      QMessageBox::about( this, "Gutenbrowser", "<p>Thanks to Trolltech for this</p>" );
-//  }
-
-//  void HelpWindow::aboutQt()
-//  {
-//      QMessageBox::aboutQt( this, "QBrowser" );
-//  }
-
 void HelpWindow::openFile()
 {
 #ifndef QT_NO_FILEDIALOG
@@ -292,26 +285,31 @@ void HelpWindow::pathSelected( const QString &_path )
 
 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() );
 }
 
 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();
 }
 
 void HelpWindow::histChosen( int i )