1 files changed, 9 insertions, 6 deletions

diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index be2b897..f14080f 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -376,132 +376,134 @@ void Gutenbrowser::downloadLibIndex() {
             //                { // use new, improved, *INSTANT* network-dialog-file-getterer
             ////              QMessageBox::message("Note","");
             //                }
             // if(NetworkDlg)
             //    delete NetworkDlg;
 }
 
 
 void Gutenbrowser::PrintBtn() {
 }
 
 void Gutenbrowser::SearchBtn() {
         if( loadCheck) {
                 odebug << "loadCheck: we have a loaded doc" << oendl;
                 Search();
         }
             //  else
             //  QMessageBox::message("Note","Sorry, can't search. No etext is loaded");
 }
 
 
 void Gutenbrowser::ForwardBtn() {
 
         if( !ForwardButton->autoRepeat() && !ForwardButton->isDown()) {
 
                 QString s;
                 QString insertString;
                 int pageSize= Lview->PageSize();
                 Lview->clear();
 
                 for(int fd=0; fd < pageSize - 1;fd++) {
                         f.readLine(s, 256);
                         if(useWrap)
                                 s.replace(QRegExp("\n"),"");
                         insertString+=s;
                         Lview->insertLine( s, -1);
                             //            odebug << s << oendl;
                         currentLine++;
                 }
                     //        Lview->insertAt( insertString,0,0, FALSE);
                 currentFilePos = f.at();
                     //        if( i_pageNum != pages) {
                     //        Lview->MultiLine_Ex::pageDown( FALSE);
                 i_pageNum++;
                 pageStopArray.resize(i_pageNum + 1);
                     //          int length = Lview->length();
 
                 pageStopArray[i_pageNum ] = currentFilePos;
-                    //         qDebug("%d current page is number %d, pagesize %d, length %d, current %d",
-                    //                currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
+                    //         odebug << currentFilePos << " current page is number " << i_pageNum
+                    //                << ", pagesize " << pageSize << ", length " << Lview->length()
+                    //                << ", current " << pageStopArray[i_pageNum] << oendl;
                 setStatus();
                 Lview->setCursorPosition( 0, 0, FALSE);
                     //        }
 
         } else {
                     //         odebug << "bal" << oendl;
                     //         if( i_pageNum != pages) {
 
                     // //          int newTop = Lview->Top();
                     //               //      if(Lview->lastRow() > i)
                     //             Lview->ScrollUp(1);
                     //               //      i_pageNum++;
                     //             setStatus();
                     //             Lview->setCursorPosition( Lview->Top(), 0, FALSE);
 
                     //         }
 
         }
         Lview->setFocus();
 
             //    odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
 }
 
 
 void Gutenbrowser::BackBtn() {
         if( i_pageNum > 0) {
                 int pageSize= Lview->PageSize();
                     //        int length=Lview->length();
 
                 i_pageNum--;
                 currentFilePos = f.at();
 
-                    //         qDebug("%d move back to %d, current page number %d, %d, length %d",
-                    //                currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
+                    //         odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ]
+                    //                << ", current page number " << i_pageNum
+                    //                << ", " << pageSize << ", length " << Lview->length() << oendl;
 
                 if(  i_pageNum < 2) {
                         f.at( 0);
                 } else {
                         if(!f.at( pageStopArray[i_pageNum - 1] ))
                                 odebug << "File positioned backward did not work" << oendl;
                 }
                 QString s;
                     //        int sizeLine=0;
                 Lview->clear();
                     //        QString insertString;
 
                 for(int fd = 0; fd < pageSize ;fd++) {
                             //        Lview->removeLine( Lview->PageSize() );
                         f.readLine(s, 256);
                         if(useWrap)
                                 s.replace(QRegExp("\n"),"");
                         currentLine++;
                             //            insertString+=s;
                         Lview->insertLine( s, -1);
                 }
 
                     //        Lview->insertAt( insertString,0,0, FALSE);
 
                 if( !BackButton->autoRepeat() && !BackButton->isDown()) {
                         QString topR;
                         QString lastR;
                         QString pageR;
                             //    int sizer =  Lview->lastRow() - Lview->topRow();
                             //    int i_topRow = Lview->topRow();
                         if( i_pageNum < 1)
                                 i_pageNum = 1;
             setCaption(QString::number(i_pageNum));
                 } else {
                             //      int newTop = Lview->Top();
                             //      if(Lview->lastRow() > i)
                         Lview->MultiLine_Ex::pageUp( FALSE);
                             //      Lview->ScrollDown(1);
                             //            i_pageNum--;
                         if( i_pageNum < 1)
                                 i_pageNum = 1;
                         setStatus();
                         Lview->setCursorPosition( Lview->Top(), 0, FALSE);
 
                 }
         }
         Lview->setFocus();
 }
@@ -754,98 +756,99 @@ bool Gutenbrowser::load( const char *fileName) {
                         Lview->setFixedVisibleLines(19);
                 else
                         Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2);
         }
 
         Config cfg("Gutenbrowser");
         cfg.setGroup("General");
         cfg.writeEntry("Current",fileName);
         currentLine=0;
 
         file_name=fileName;
         QString o_file = fileName;
 
             //  if (i_pageNum < 1) {
         i_pageNum = 1;
             //  }
         odebug << "ready to open "+o_file << oendl;
 
         if(f.isOpen()) f.close();
         f.setName( o_file);
 
         if ( !f.open( IO_ReadOnly)) {
                 QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) );
                 return  false;
         }
         currentFilePos = 0;
         pageStopArray.resize(3);
         pageStopArray[0] = currentFilePos;
 
         fileHandle = f.handle();
         QString insertString;
         QTextStream t(&f);
         QString s;
         for(int fd=0; fd < Lview->PageSize() ;fd++) {
                 s=t.readLine();
                     //      insertString+=s;
                 if(useWrap)
                         s.replace(QRegExp("\n"),"");
                     //    s.replace(QRegExp("\r"),"");
                 Lview->insertLine( s,-1);
                 currentLine++;
         }
 
             //    int length = Lview->length();
         currentFilePos = f.at();
 
         pageStopArray[1] = currentFilePos;
 
-        qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d",
-                     currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
+        odebug << "<<<<<<<<<<<" << currentFilePos << " current page is number " << i_pageNum
+               << ", length " << Lview->length() << ", current " << pageStopArray[i_pageNum]
+               << ", 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();
         }
 }
 
 void Gutenbrowser::search_slot( ) {
     int line, col;
     if (!searchDlg /*&& !loadCheck */)
                 return;
 
     Lview->getCursorPosition(&line,&col);
     QString to_find_string=searchDlg->get_text();