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
@@ -824,64 +824,58 @@ bool Gutenbrowser::load( const char *fileName) {
                                          << ", pageSize " << Lview->PageSize() << oendl;
 
                 Lview->setMaxLines(Lview->PageSize()*2);
 //        odebug << "Gulped " << currentLine << "" << oendl;
                 setCaption(title);
                 Lview->setAutoUpdate( TRUE);
 
 //        Lview->setCursorPosition(0,0,FALSE);
 
                         //    pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
                         //odebug << "number of pages " << pages << "" << oendl;
 
                 loadCheck = true;
                 enableButtons(true);
                 if( donateMenu->count() == 3) {
                                 donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() ));
                 }
                 Lview->setFocus();
 
                         //   QCopEnvelope("QPE/System", "notBusy()" );
                 return true;
 } // end load
 
 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();
 }
 
 void Gutenbrowser::search_slot( ) {
     int line, col;
     if (!searchDlg /*&& !loadCheck */)
                                 return;
 
     Lview->getCursorPosition(&line,&col);
     QString to_find_string=searchDlg->get_text();
 
                         // searchDlg->get_direction();// is true if searching backward
     if ( last_search != 0 && searchDlg->get_direction() ){
                                 col = col  - pattern.length() - 1 ;
     }
   again:
     int  result = doSearch( to_find_string , /* searchDlg->case_sensitive()*/ TRUE, searchDlg->forward_search(), line, col);
     if(result == 0){
                                 if(!searchDlg->get_direction()){ // forward search
                                                 int query = QMessageBox::information( searchDlg, "Find",
                                                                                                                                                                                                         "End of document reached.\nContinue from the beginning?",
                                                                                                                                                                                                         "Yes", "No", "", 0,1);
                                                 if (query == 0){
                                                                 line = 0;
                                                                 col = 0;
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
@@ -172,78 +172,71 @@ void HelpWindow::textChanged()
     if ( !selectedURL.isEmpty() && pathCombo ) {
   bool exists = FALSE;
   int i;
   for ( i = 0; i < pathCombo->count(); ++i ) {
       if ( pathCombo->text( i ) == selectedURL ) {
     exists = TRUE;
     break;
       }
   }
   if ( !exists ) {
       pathCombo->insertItem( selectedURL, 0 );
       pathCombo->setCurrentItem( 0 );
       mHistory[ hist->insertItem( selectedURL ) ] = selectedURL;
   } else
       pathCombo->setCurrentItem( i );
   selectedURL = QString::null;
     }
 }
 
 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
     QString fn = QFileDialog::getOpenFileName( QString::null, QString::null, this );
     if ( !fn.isEmpty() )
   browser->setSource( fn );
 #endif
 }
 
 void HelpWindow::newWindow()
 {
     ( new HelpWindow(browser->source(), "qbrowser") )->show();
 }
 
 void HelpWindow::print()
 {
 #ifndef QT_NO_PRINTER
     QPrinter printer;
     printer.setFullPage(TRUE);
     if ( printer.setup() ) {
   QPainter p( &printer );
   QPaintDeviceMetrics metrics(p.device());
   int dpix = metrics.logicalDpiX();
   int dpiy = metrics.logicalDpiY();
@@ -271,63 +264,68 @@ void HelpWindow::print()
       printer.newPage();
       page++;
   } while (TRUE);
     }
 #endif
 }
 
 void HelpWindow::pathSelected( const QString &_path )
 {
     browser->setSource( _path );
     QMap<int, QString>::Iterator it = mHistory.begin();
     bool exists = FALSE;
     for ( ; it != mHistory.end(); ++it ) {
   if ( *it == _path ) {
       exists = TRUE;
       break;
   }
     }
     if ( !exists )
   mHistory[ hist->insertItem( _path ) ] = _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 )
 {
     if ( mHistory.contains( i ) )
   browser->setSource( mHistory[ i ] );
 }
 
 void HelpWindow::bookmChosen( int i )
 {
     if ( mBookmarks.contains( i ) )
   browser->setSource( mBookmarks[ i ] );
 }
 
 void HelpWindow::addBookmark()
 {
     mBookmarks[ bookm->insertItem( caption() ) ] = caption();
 }