- convert qDebug to odebug

12 files changed, 258 insertions, 217 deletions

diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 5b22b00..270a4cf 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -13,17 +13,21 @@
 //   ***************************************************************************/
 //ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
 
+#include "LibraryDialog.h"
+#include "output.h"
+
+/* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
+#include <opie2/odebug.h>
 
-#include "LibraryDialog.h"
-#include "output.h"
-
+/* QT */
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 //#include <qlayout.h>
 
+/* STD */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,7 +68,7 @@ LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool modal, W
 
 		config.setGroup( "FTPsite" );
 		ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
-		qDebug("Library Dialog: ftp_host is "+ftp_host);
+        odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
 			//      ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
 			//      ftp_host=ftp_host.stripWhiteSpace();
 		ftp_base_dir= config.readEntry("base",  "/pub/gutenberg");
@@ -77,7 +81,7 @@ LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool modal, W
 
 		config.setGroup("General");
 		downDir =config.readEntry( "DownloadDirectory",local_library);
-		qDebug("downDir is "+downDir);
+        odebug << "downDir is "+downDir << oendl;
 		newindexLib.setName( old_index);
 		indexLib.setName( old_index);
 
@@ -99,7 +103,7 @@ LibraryDialog::~LibraryDialog()
 void  LibraryDialog::Newlibrary()
 {
 #ifndef Q_WS_QWS //sorry embedded gutenbrowser cant use zip files
-			//qDebug("Opening new library index %s",newindexLib);
+            //odebug << "Opening new library index " << newindexLib << "" << oendl;
 		if ( newindexLib.open( IO_ReadOnly) ) {
 				setCaption( tr( "Library Index - using master pg index."  ) );// file opened successfully
 				QTextStream indexStream( &newindexLib );
@@ -121,7 +125,7 @@ void  LibraryDialog::Newlibrary()
 								getAuthor();  // groks author
 								author = author.stripWhiteSpace();
 								if (authBox->isChecked()) { // this reverses the first name and last name of the author
-											//                    qDebug("Sorting last name first");
+                                            //                    odebug << "Sorting last name first" << oendl;
 										QString lastName, firstName="";
 										int finder=author.findRev( ' ', -1, TRUE);
 										lastName=author.right( author.length()-finder);
@@ -180,7 +184,7 @@ void LibraryDialog::Library()
 		ListView4->clear();
 		ListView5->clear();
 
-		qDebug("opening GUTINDEX.ALL file");
+        odebug << "opening GUTINDEX.ALL file" << oendl;
 		IDontKnowWhy = "";
 		if ( indexLib.open( IO_ReadOnly) ) {  // file opened successfully
 				QTextStream indexStream( &indexLib );
@@ -200,17 +204,17 @@ void LibraryDialog::Library()
 												file.remove(1,1);
 										if( file.find("]",0,TRUE) != -1)
 												file = file.left( file.find("]",0,TRUE));
-											//qDebug("file is "+file);
+                                            //odebug << "file is "+file << oendl;
 											///               number = indexLine.mid(  indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
 										number = indexLine.mid(55,5);
 										number = number.stripWhiteSpace();
 											//                  title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
 										title = indexLine.mid( 9,  50 );
 										title = title.stripWhiteSpace();
-											//qDebug("title is "+title);
+                                            //odebug << "title is "+title << oendl;
 										getAuthor();  // grok author
 										author = author.stripWhiteSpace();
-											//qDebug("author is "+author);
+                                            //odebug << "author is "+author << oendl;
 										if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
 												QString lastName, firstName="";
 												int finder=author.findRev( ' ', -1, TRUE);
@@ -397,14 +401,14 @@ void LibraryDialog::select_title( QListViewItem * item)
 		if(DlglistItemTitle.length()>2) {
 					//    DlglistItemNumber = item->text(0);
 				item = 0;
-				qDebug( "string from librarydialog is:%s %s %s", DlglistItemYear.latin1(),DlglistItemFile.latin1(),DlglistItemNumber.latin1());
-				qDebug("Title is "+DlglistItemTitle);
+                odebug << "string from librarydialog is:" << DlglistItemYear << " " << DlglistItemFile << " " << DlglistItemNumber << "" << oendl;
+                odebug << "Title is "+DlglistItemTitle << oendl;
 
 					// check for connection here
 					//    if( get_extext())
 
 				if(download_Etext())  {
-							//        qDebug("get here 2");
+                            //        odebug << "get here 2" << oendl;
 						if(i_binary == 1)  {
 
 						}
@@ -423,7 +427,7 @@ bool  LibraryDialog::download_Etext()
 		ftp_host=cfg.readEntry("SiteName", "sailor.gutenberg.org");
 		ftp_base_dir= cfg.readEntry("base",  "/pub/gutenberg");
 
-		qDebug("about to network dialog");
+        odebug << "about to network dialog" << oendl;
 		QString NewlistItemNumber, NewlistItemYear, ls_result, result_line, s, dir, networkUrl, outputFile;
 
 			//////////////////// FIXME- if 'x' is part of real name....
@@ -431,11 +435,11 @@ bool  LibraryDialog::download_Etext()
 
 		if( NewlistItemFile.find( DlglistItemFile.left(4) ,0,TRUE) ==-1 ) {
 				NewlistItemFile.replace( 0,4, DlglistItemFile.left(4));
-				qDebug("NewlistItemFile is now "+NewlistItemFile);
+                odebug << "NewlistItemFile is now "+NewlistItemFile << oendl;
 		}
 		NewlistItemYear = DlglistItemYear.right(2);
 		int NewlistItemYear_Int = NewlistItemYear.toInt(0, 10);
-		qDebug(NewlistItemYear);
+        odebug << NewlistItemYear << oendl;
 		if (NewlistItemYear_Int < 91 && NewlistItemYear_Int > 70) {
 				NewlistItemYear = "90";
 		}
@@ -447,8 +451,8 @@ bool  LibraryDialog::download_Etext()
 		networkUrl= "ftp://"+ftp_host+dir;
 
 		outputFile=local_library+".guten_temp";
-			//qDebug("Download file:%s",NewlistItemFile.latin1() );
-		qDebug("Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile);
+            //odebug << "Download file:" << NewlistItemFile << "" << oendl;
+        odebug << "Checking: "+ftp_host+" "+dir+" "+outputFile+" "+NewlistItemFile << oendl;
 		QStringList networkList;
 		networkList.append((const char *)ftp_host);
 		networkList.append((const char *)dir);
@@ -462,18 +466,18 @@ bool  LibraryDialog::download_Etext()
 		
 		if( NetworkDlg->exec() != 0 )  { // use new, improved, *INSTANT* network-dialog-file-getterer
 				File_Name= NetworkDlg->localFileName;
-				qDebug("back to Library from Network Dialog");
-				qDebug("Just downloaded "+NetworkDlg->localFileName);
+                odebug << "back to Library from Network Dialog" << oendl;
+                odebug << "Just downloaded "+NetworkDlg->localFileName << oendl;
 
 					//          if (File_Name.find( local_library, 0, TRUE) != -1 ) { //could not be found
 					//              QString oldName=File_Name;
 					//              File_Name.replace(0,local_library.length(),downDir);
-					//              qDebug("File_Name now is "+File_Name);
+                    //              odebug << "File_Name now is "+File_Name << oendl;
 
 					//          }
 					// rename .txt to .etx
 				if(NetworkDlg->successDownload) {
-						qDebug("Filename is "+File_Name);
+                        odebug << "Filename is "+File_Name << oendl;
 						if(File_Name.right(4)==".txt") {
 								QString  s_fileName=File_Name;
 								s_fileName.replace( s_fileName.length()-3,3,"gtn");
@@ -481,7 +485,7 @@ bool  LibraryDialog::download_Etext()
 								rename(File_Name.latin1(),s_fileName.latin1());
 								File_Name=s_fileName;
 
-								qDebug("Filename is now "+File_Name);
+                                odebug << "Filename is now "+File_Name << oendl;
 
 						}
 						if(File_Name.length() > 5 ) {
@@ -490,20 +494,20 @@ bool  LibraryDialog::download_Etext()
 								QString  name_file=fi.fileName();
 								name_file=name_file.left(name_file.length()-4);
 
-								qDebug("Setting doclink");
+                                odebug << "Setting doclink" << oendl;
 								DocLnk lnk;
-								qDebug("name is "+name_file);
+                                odebug << "name is "+name_file << oendl;
 								lnk.setName(name_file); //sets file name
-								qDebug("Title is "+DlglistItemTitle);
+                                odebug << "Title is "+DlglistItemTitle << oendl;
 								lnk.setComment(DlglistItemTitle);
 
-								qDebug("Filename is "+File_Name);
+                                odebug << "Filename is "+File_Name << oendl;
 								lnk.setFile(File_Name); //sets File property
 								lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
 								lnk.setExec(File_Name);
 								lnk.setIcon("gutenbrowser/Gutenbrowser");
 								if(!lnk.writeLink()) {
-										qDebug("Writing doclink did not work");
+                                        odebug << "Writing doclink did not work" << oendl;
 								} else {
 								}
 						} else
@@ -570,14 +574,14 @@ void LibraryDialog::cancelIt()
 bool LibraryDialog::setTitle()
 {
 		Config config("Gutenbrowser");
-		qDebug("setting title");
-		qDebug(DlglistItemTitle);
+        odebug << "setting title" << oendl;
+        odebug << DlglistItemTitle << oendl;
 
 		if( DlglistItemTitle.find("[",0,TRUE) != -1)
 				DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
 		if( DlglistItemTitle.find("]",0,TRUE) !=-1)
 				DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
-		qDebug("Title being set is "+DlglistItemTitle);
+        odebug << "Title being set is "+DlglistItemTitle << oendl;
 		int test = 0;
 		QString ramble, temp;
 		config.setGroup("Files");
@@ -738,7 +742,7 @@ void LibraryDialog::onButtonSearch()
 				SearchResultsDialog->showMaximized();
 				if( SearchResultsDialog->exec() != 0) {
 						texter = SearchResultsDialog->selText;
-							//           qDebug(texter);
+                            //           odebug << texter << oendl;
 						resultLs= SearchResultsDialog->resultsList;
 						i_berger = 1;
 				}
@@ -749,7 +753,7 @@ void LibraryDialog::onButtonSearch()
 				QString tester;
 				for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
 						texter.sprintf("%s \n",(*it).latin1());
-							//           qDebug(texter);
+                            //           odebug << texter << oendl;
 						if( tester!=texter)
 								parseSearchResults( texter);
 						tester = texter;
@@ -806,7 +810,7 @@ void  LibraryDialog::parseSearchResults( QString resultStr)
 
   //          int exit=QMessageBox::information(this, "Unzip?", "Ok to unzip "+ zipFile+" ?", QMessageBox::Yes, QMessageBox::No);
   //          if (exit==QMessageBox::Yes) {
-  //              qDebug("Issuing the command "+cmd);
+  //              odebug << "Issuing the command "+cmd << oendl;
   //  #if defined(_WS_WIN_)
   //      WinExec( cmd, SW_HIDE );
   //  #endif
@@ -840,7 +844,7 @@ void LibraryDialog::sort()
     Downloads the current selected listitem*/
 bool LibraryDialog::getItem(QListViewItem *it)
 {
-			//    qDebug("selected getItem");
+            //    odebug << "selected getItem" << oendl;
 
 			//    DlglistItemNumber = it->text(0);
 		DlglistItemTitle = it->text(0);
@@ -858,7 +862,7 @@ bool LibraryDialog::getItem(QListViewItem *it)
     download button is pushed so we get the current items to download*/
 bool LibraryDialog::onButtonDownload()
 {
-			//    qDebug("selected onButtonDownloadz");
+            //    odebug << "selected onButtonDownloadz" << oendl;
 
 		QListViewItemIterator it1( ListView1 );
 		QListViewItemIterator it2( ListView2 );
@@ -900,7 +904,7 @@ bool LibraryDialog::onButtonDownload()
     handles the sorting combo box */
 void LibraryDialog::comboSelect(int index)
 {
-			//    qDebug("we are sorting");
+            //    odebug << "we are sorting" << oendl;
 		ListView1->setSorting( index, TRUE);
 		ListView2->setSorting( index, TRUE);
 		ListView3->setSorting( index, TRUE);
@@ -930,7 +934,7 @@ void LibraryDialog::newList()
 				QDir gutDir(QPEApplication::qpeDir()+"etc/gutenbrowser");
 				if(!gutDir.exists()) gutDir.mkdir(QPEApplication::qpeDir()+"etc/gutenbrowser",true);
 				if( chdir(QPEApplication::qpeDir()+"etc/gutenbrowser") == 0) {
-						qDebug("changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser");
+                        odebug << "changing dir "+QPEApplication::qpeDir()+"etc/gutenbrowser" << oendl;
 						QString gutenindex1 = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
 						QString cmd="wget -O " + gutenindex1 + " http://sailor.gutenberg.org/GUTINDEX.ALL 2>&1";
 
@@ -951,7 +955,7 @@ void LibraryDialog::newList()
 								fp = popen(  (const char *) cmd, "r");
 								if ( !fp ) {
 								} else {
-										qDebug("Issuing the command\n"+cmd);
+                                        odebug << "Issuing the command\n"+cmd << oendl;
 											//                 system(cmd);
 										while ( fgets( line, sizeof line, fp)) {
 												outDlg->OutputEdit->append(line);
@@ -965,7 +969,7 @@ void LibraryDialog::newList()
 											//                  if( QFile(gutenindex1).exists() ) {
 											//                      QString gutenindex=QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
 											//                      if( rename(gutenindex1.latin1(),gutenindex.latin1()) !=0)
-											//                          qDebug("renaming error");
+                                            //                          odebug << "renaming error" << oendl;
 											//                  }
 
 								}
@@ -1024,7 +1028,7 @@ bool LibraryDialog::moreInfo()
 		}
 		item=0;
 		if(titleString.length()>2) {
-				qDebug( "Title is "+titleString );
+                odebug << "Title is "+titleString << oendl;
 				titleString.replace( QRegExp("\\s"), "%20");
 				titleString.replace( QRegExp("'"), "%20");
 				titleString.replace( QRegExp("\""), "%20");
@@ -1048,12 +1052,12 @@ void LibraryDialog::FindLibrary()
 		if( QFile( new_index).exists() /* && this->isHidden() */) {
 				newindexLib.setName( new_index);
 				indexLib.setName( new_index);
-				qDebug("index file is "+ new_index);
+                odebug << "index file is "+ new_index << oendl;
 				Newlibrary();
 		} else {
 				newindexLib.setName( old_index);
 				indexLib.setName( old_index);
-				qDebug("new index nameis "+ old_index);
+                odebug << "new index nameis "+ old_index << oendl;
 				Library();
 		}
 		indexLoaded=true;
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index aed53c6..6e6b707 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -10,15 +10,15 @@
 //  ***************************************************************************/
 // // half-assed attempt at providing a network dialog.
 // /* Created: Sun Aug 27 15:24:52 2000*/
-#include <unistd.h>
 
-extern "C" {
-#include <ftplib.h>
-}
 
 #include "NetworkDialog.h"
 #include "gutenbrowser.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qprogressbar.h>
 #include <qstringlist.h>
 #include <qpe/config.h>
@@ -30,6 +30,12 @@ extern "C" {
 #include <qpushbutton.h>
 #include <qlayout.h>
 
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
 QProgressBar* ProgressBar1;
 QPushButton* buttonCancel;
 static netbuf *conn = NULL;
@@ -119,7 +125,7 @@ void NetworkDialog::initDialog() {
 //    connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot()));
 //    connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
 		if(autoOk) {
-				qWarning("XXXXXXXXXXXXXXXXXXXXXXXX");
+                owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
 				buttonOk->setDown(true);
 				doOk();
 		}
@@ -143,13 +149,13 @@ void NetworkDialog::timeSlot() {
 //      timerProgess--;
 //          posTimer=TRUE;
 //      }
-//  //    qDebug("timer event");
+//  //    odebug << "timer event" << oendl;
 //      qApp->processEvents();
 //      repaint();
 }
 
 void NetworkDialog::connectionTimeSlot() {
-//      qDebug("Connections timed out");
+//      odebug << "Connections timed out" << oendl;
 //      ftpQuit();
 //      qApp->processEvents();
 //      repaint();
@@ -167,21 +173,21 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //    connectionTimer->start( 600 , FALSE);
     warnLabel ->setText( "");
     qApp->processEvents();
-    qDebug("Downloading: %s",networkUrl.latin1());
-    qDebug("Into: %s",localFileName.latin1());
+    odebug << "Downloading: " << networkUrl << "" << oendl;
+    odebug << "Into: " << localFileName << "" << oendl;
     if( networkUrl.length() > 5) {
         QString ftp_user = "anonymous";
         QString ftp_pass = "zaurus@gutenbrowser.com";
 //    ftp_host= networkUrl.mid(networkUrl.find("ftp://",0, TRUE),
         if(ftp_host.length() < 2) {
-            qDebug("Please select an ftp host" );
+            odebug << "Please select an ftp host" << oendl;
             successDownload=false;
             QMessageBox::message("Note","You need to select an ftp host");
             return false;
         }
         QString msg;
-        qDebug(ftp_host);
-        qDebug("Opening ftp connection.");
+        odebug << ftp_host << oendl;
+        odebug << "Opening ftp connection." << oendl;
         warnLabel->setText("connecting to: "+ftp_host );
         qApp->processEvents();
           /////////// Open FTP connection
@@ -200,7 +206,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             QMessageBox::message("Note",msg);
             return  false;
         }
-        qDebug("Changing directories.");
+        odebug << "Changing directories." << oendl;
         TextLabel3->setText("Changing directories.");
         qApp->processEvents();
         if (!FtpChdir( dir.latin1(), conn )) {
@@ -217,7 +223,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //              FtpQuit(conn);
 //              return false;
 //      }
-        qDebug("Requesting directory list.");
+        odebug << "Requesting directory list." << oendl;
         TextLabel3->setText("Getting directory list.");
         qApp->processEvents();
         if (!FtpDir( "./.guten_temp", dir.latin1(), conn) ) {
@@ -232,7 +238,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
         if (tmp.open(IO_ReadOnly)) {
             QTextStream t( &tmp );   // use a text stream
-            qDebug("Finding partial filename "+s_partialFileName);
+            odebug << "Finding partial filename "+s_partialFileName << oendl;
             while ( !t.eof()) {
                 s = t.readLine();
 
@@ -241,12 +247,12 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
                     if (str.contains(".txt")) {
                         File_Name = str;
-                        qDebug("Found file_name "+ File_Name);
+                        odebug << "Found file_name "+ File_Name << oendl;
                         break;
                     }
 //                      if (str.contains(".zip")) {
 //                          File_Name = str;
-//                          qDebug("Found file_name "+ File_Name);
+//                          odebug << "Found file_name "+ File_Name << oendl;
 //                          break;
 //                      }
                     
@@ -256,15 +262,15 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //        tmp.remove(); ///TODO this is for release version Zaurus
         }
         else
-            qDebug("Error opening temp file.");
+            odebug << "Error opening temp file." << oendl;
 
         Config cfg("Gutenbrowser");
         cfg.setGroup("General");
         QString temp=cfg.readEntry("DownloadDirectory",local_library);
 
         localFileName = temp+File_Name;
-        qDebug("Requesting file "+ File_Name);
-        qDebug( "Saving as "+localFileName);
+        odebug << "Requesting file "+ File_Name << oendl;
+        odebug << "Saving as "+localFileName << oendl;
         msg="Requesting file "+ File_Name;
         TextLabel3->setText(msg);
         qApp->processEvents();
@@ -293,7 +299,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             FtpQuit(conn);
             return false;
         }
-        qDebug("Ftp session successful");
+        odebug << "Ftp session successful" << oendl;
         successDownload=TRUE;
         FtpQuit(conn);
         return true;
@@ -302,7 +308,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 }
 
 void NetworkDialog::doOk() {
-		qWarning("Do OK");
+        owarn << "Do OK" << oendl;
     QString loginStr;
     loginStr = "gutenbrowser";
     if ( !ftp_host.isEmpty() )   {
diff --git a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
index 4ddb3f0..d989304 100644
--- a/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/SearchDialog.cpp
@@ -98,7 +98,7 @@ void SearchDialog::byeBye()
 {
 
     searchString = get_text();
-//    qDebug("Search string is "+searchString);
+//    odebug << "Search string is "+searchString << oendl; 
     Config cfg("Gutenbrowser");
     cfg.setGroup("General");
     cfg.writeEntry("LastSearch",searchString);
@@ -119,7 +119,7 @@ void SearchDialog::byeBye()
 void SearchDialog::closed()
 {
     searchString = get_text();
-//    qDebug("Search string is "+searchString);
+//    odebug << "Search string is "+searchString << oendl; 
     Config cfg("Gutenbrowser");
     cfg.setGroup("General");
     cfg.writeEntry("LastSearch",searchString);
diff --git a/noncore/apps/opie-gutenbrowser/browserDialog.cpp b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
index 81dd516..cc05d04 100644
--- a/noncore/apps/opie-gutenbrowser/browserDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/browserDialog.cpp
@@ -10,6 +10,7 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 using namespace Opie::Ui;
 
 /* QT */
@@ -52,7 +53,7 @@ void optionsDialog::BrowseSelected() {
     if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )  {
       fileName = str;
 //      QStringList fileList=browseForFiles->fileList;
-//      qDebug(selFile);
+//      odebug << selFile << oendl;
 //      QStringList::ConstIterator f;
 //      QString fileTemp,filer;
 //      for (  f = fileList.begin(); f != fileList.end(); f++ ) {
@@ -76,7 +77,7 @@ void optionsDialog::BrowseSelected() {
 void optionsDialog::setHttp(int index) {
     Config config("Gutenbrowser");
     config.setGroup( "HttpServer" );
-    qDebug("writing http server");
+    odebug << "writing http server" << oendl;
     if( index== 0) {
         config.writeEntry("Preferred", "http://sailor.gutenberg.org");
     } else {
diff --git a/noncore/apps/opie-gutenbrowser/fontDialog.cpp b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
index a17b1d3..fa964a6 100644
--- a/noncore/apps/opie-gutenbrowser/fontDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/fontDialog.cpp
@@ -90,7 +90,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
     styleListBox->clear();
 //  clearListBoxes();
   family = text;
-//  qDebug(family);
+//  odebug << family << oendl; 
   QStringList styles = fdb.styles( family ); // string list of styles of our current font family
   styleListBox->insertStringList( styles);
   QString dstyle;// = "\t" + style + " (";
@@ -100,7 +100,7 @@ void FontDialog::familyListBoxSlot(const QString & text)
 QValueList<int> smoothies = fdb.smoothSizes( family, styleListBox->text(0) );
    for ( QValueList<int>::Iterator points = smoothies.begin(); points != smoothies.end(); ++points ) {
        dstyle = QString::number( *points );
-       qDebug(dstyle);
+       odebug << dstyle << oendl; 
       sizeComboBox->insertItem(  dstyle.left( dstyle.length() - 1 ));
   }
 #else
@@ -151,7 +151,7 @@ void FontDialog::populateLists()
   for ( QStringList::Iterator f = families.begin(); f != families.end();++f ) {
       QString family = *f;
 //      if(family == defaultFont.family())
-//          qDebug(family);
+//          odebug << family << oendl; 
       familyListBox->insertItem( family);
 
       if( familyListBox->text(0) == family) {
@@ -209,13 +209,13 @@ void FontDialog::changeText()
     else {
         family = familyListBox->currentText();
     }
-//          qDebug("Font family is "+family);
+//          odebug << "Font family is "+family << oendl; 
     if( styleListBox->currentItem() == -1)
         style=styleListBox->text(0);
     else {
         style = styleListBox->currentText();
     }
-//          qDebug("font style is "+style);
+//          odebug << "font style is "+style << oendl; 
 
     if( sizeComboBox->currentItem() == -1 )
         size = sizeComboBox->text(0);
@@ -223,7 +223,7 @@ void FontDialog::changeText()
      size = sizeComboBox->currentText();
     }
 
-//       qDebug("Font size is "+size);
+//       odebug << "Font size is "+size << oendl; 
     bool ok;
     int i_size = size.toInt(&ok,10);
     QStringList charSetList = fdb.charSets(family);
@@ -231,13 +231,13 @@ void FontDialog::changeText()
     QString charSet;
           for ( QStringList::Iterator s = charSetList.begin(); s != charSetList.end();++s ) { // for each font style
             charSet = *s;
-//            qDebug(charSet);
+//            odebug << charSet << oendl; 
           }
     selectedFont = fdb.font(family,style,i_size,charSet);
     QFontInfo fontInfo( selectedFont);
-//      if(fontInfo.italic() ) qDebug("italic");
+//      if(fontInfo.italic() ) odebug << "italic" << oendl; 
     selectedFont.setWeight(fontInfo.weight() );    
-//      qDebug("Style are "+style+" %d ",fontInfo.weight());
+//      odebug << "Style are "+style+" " << fontInfo.weight() << " " << oendl; 
     Config cfg("Gutenbrowser");
     cfg.setGroup("Font");
     cfg.writeEntry("Family",family);
@@ -249,7 +249,7 @@ void FontDialog::changeText()
           selectedFont = fdb.font(family,"Regular",i_size,charSet);
           selectedFont.setItalic(TRUE); //ya right
           cfg.writeEntry("Italic","TRUE");
-//            qDebug("Style is "+styleListBox->currentText());
+//            odebug << "Style is "+styleListBox->currentText() << oendl; 
       } else
           cfg.writeEntry("Italic","FALSE");
 
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index ad770b5..a9c7346 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -11,20 +11,25 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
+
 #include "optionsDialog.h"
 #include "gutenbrowser.h"
 //#include "NetworkDialog.h"
 #include "output.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
 #include <qprogressbar.h>
-#include <stdlib.h>
 #include <qurloperator.h>
-#include <qpe/config.h>
 #include <qlistbox.h>
 
+/* STD */
+#include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 // :)~
 void optionsDialog::ftpSiteDlg( )
@@ -38,7 +43,7 @@ void optionsDialog::ftpSiteDlg( )
     if( !dir.exists())
         dir.mkdir(ListFile,true);
     ListFile+="/ftpList";
-    qDebug("opening "+ListFile);
+    odebug << "opening "+ListFile << oendl;
     if ( QFile(ListFile).exists() ) {
         openSiteList();
     } else {
@@ -76,7 +81,7 @@ void optionsDialog::getSite()
 //    NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog",TRUE,0,networkUrl,outputFile);
 //    if( NetworkDlg->exec() != 0 )
 //    { // use new, improved, *INSTANT* network-dialog-file-getterer
-//        qDebug("gitcha!");
+//        odebug << "gitcha!" << oendl;
 //    }
 //    delete NetworkDlg;
 //#ifdef Q_WS_QWS
@@ -84,7 +89,7 @@ void optionsDialog::getSite()
 // TODO qprocess here
 
     QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ;
- qDebug("Issuing the command "+cmd);
+ odebug << "Issuing the command "+cmd << oendl;
     Output *outDlg;
     outDlg = new Output( 0, tr("Downloading ftp sites...."),TRUE);
     outDlg->showMaximized();
@@ -113,7 +118,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
 {
 // parse ftplist html and extract just the machine names/directories
 // TODO: add locations!!
-    qDebug("parse ftplist "+outputFile);
+    odebug << "parse ftplist "+outputFile << oendl;
     QString ftpList, s_location;
     QFile f( outputFile );
 
@@ -152,11 +157,11 @@ bool optionsDialog::parseFtpList( QString outputFile)
                     s = t.readLine();
                     s = t.readLine();
             if(( start=s.find("<BR>(", 0, TRUE) ) != -1) {
-//              qDebug("%s",s.latin1());
+//              odebug << "" << s << "" << oendl;
               end = s.find( ")", 0, TRUE)+1;
               s_location= s.mid( start+4, (end - start)  );
 
-//               qDebug("%s", s_location.latin1());
+//               odebug << "" << s_location << "" << oendl;
 //                    ftpList += ftpSite + "\n";
 //                    ftp_QListBox_1->sort( TRUE );
                     ftpList += s_location+ "    "+ftpSite+"\n";
@@ -190,7 +195,7 @@ bool optionsDialog::parseFtpList( QString outputFile)
 
 void optionsDialog::openSiteList() {
 
-    qDebug(" just opens the ftp site list");
+    odebug << " just opens the ftp site list" << oendl;
 //  ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList";
     QFile f( ListFile);
     if(!f.open( IO_ReadWrite )) {
@@ -230,7 +235,7 @@ void optionsDialog::select_site( const char *index )
     QString s_site2;
 //    if(s_site.find("(",0,TRUE))
     s_site2=s_site.right( s_site.length()-(s_site.find("    ",0,TRUE)+4)  );
-qDebug("Selected ftp site is "+ s_site2);
+odebug << "Selected ftp site is "+ s_site2 << oendl;
     int i_ftp = s_site2.find("/", 0, FALSE);
     ftp_host = s_site2.left(i_ftp );
     ftp_base_dir = s_site2.right( s_site2.length() - i_ftp);
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 2a9a71e..be2b897 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -14,13 +14,7 @@
 //        http://digital.library.upenn.edu/books/titles.html
 // ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
 // donate@gutenberg.net
-#include <qpe/qpeapplication.h>
-#include <qpe/fontdatabase.h>
-#include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/mimetype.h>
-#include <qpe/resource.h>
-#include <qpe/applnk.h>
+
 
 #include "editTitle.h"
 #include "gutenbrowser.h"
@@ -33,7 +27,17 @@
 #include "openetext.h"
 #include "output.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/mimetype.h>
+#include <qpe/resource.h>
+#include <qpe/applnk.h>
 
+/* QT */
 #include <qregexp.h>
 #include <qregion.h>
 #include <qpaintdevicemetrics.h>
@@ -51,6 +55,7 @@
 #include <qscrollview.h>
 #include <qpoint.h>
 
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -131,7 +136,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 				config.setGroup( tempTitle);
 				int index=config.readNumEntry( "LineNumber", -1 );
 				if( index != -1) {
-							//        qDebug( tempTitle);
+                            //        odebug << tempTitle << oendl;
 						bookmarksMenu->insertItem( tempTitle);
 				}
 		}
@@ -154,7 +159,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 					//          if(firstTime)
 					//              Bookmark();
 				for (int i=1;i< qApp->argc();i++) {
-						qDebug("Suppose we open somethin");
+                        odebug << "Suppose we open somethin" << oendl;
 						load(qApp->argv()[i]);
 				}
 		} else {
@@ -169,7 +174,7 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 Gutenbrowser::~Gutenbrowser() {
 			//  QPEApplication::grabKeyboard();
 			//  QPEApplication::ungrabKeyboard();
-		qDebug("Exit");
+        odebug << "Exit" << oendl;
 }
 
   /*
@@ -199,7 +204,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 				filename+="/etc/gutenbrowser/";
 		else
 				filename+="etc/gutenbrowser/";
-		qDebug("filename "+filename);
+        odebug << "filename "+filename << oendl;
 			//    QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
 
 		filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
@@ -207,11 +212,11 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 		Config config("Gutenbrowser");
 		config.setGroup( "Browser" );
 		QString brow = config.readEntry("Preferred", "Opera");
-		qDebug("Preferred browser is "+brow);
+        odebug << "Preferred browser is "+brow << oendl;
 		if(!showMsg) { //if we just get the gutenindex.all
 				cmd="wget -O " + filename +" " + url+" 2>&1" ;
 				chdir(local_library);
-				qDebug("Issuing the system command: %s", cmd.latin1());
+                odebug << "Issuing the system command: " << cmd << "" << oendl;
 
 				Output *outDlg;
 				outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
@@ -223,7 +228,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 				outDlg->OutputEdit->append( tr("Running wget") );
 				sleep(1);
 				fp = popen(  (const char *) cmd, "r");
-					//                 qDebug("Issuing the command\n"+cmd);
+                    //                 odebug << "Issuing the command\n"+cmd << oendl;
 					//                 system(cmd);
 				while ( fgets( line, sizeof line, fp)) {
 						outDlg->OutputEdit->append(line);
@@ -256,7 +261,7 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 				}
 
 				chdir(local_library);
-				qDebug("Issuing the sys command: %s", cmd.latin1());
+                odebug << "Issuing the sys command: " << cmd << "" << oendl;
 				system(cmd);
 		}
 }
@@ -266,7 +271,7 @@ void Gutenbrowser::toggleButtonIcons( bool useEm) {
 		if(useEm)
 				useEm=TRUE;
 		pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
-		qDebug("Docdir is "+QPEApplication::documentDir());
+        odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
 
 		if( useIcons && QDir( pixDir).exists() ) {
 				LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
@@ -381,7 +386,7 @@ void Gutenbrowser::PrintBtn() {
 
 void Gutenbrowser::SearchBtn() {
 		if( loadCheck) {
-				qDebug("loadCheck: we have a loaded doc");
+                odebug << "loadCheck: we have a loaded doc" << oendl;
 				Search();
 		}
 			//  else
@@ -404,7 +409,7 @@ void Gutenbrowser::ForwardBtn() {
 								s.replace(QRegExp("\n"),"");
 						insertString+=s;
 						Lview->insertLine( s, -1);
-							//            qDebug(s);
+                            //            odebug << s << oendl;
 						currentLine++;      
 				}
 					//        Lview->insertAt( insertString,0,0, FALSE);
@@ -423,7 +428,7 @@ void Gutenbrowser::ForwardBtn() {
 					//        }
 
 		} else {
-					//         qDebug("bal");
+                    //         odebug << "bal" << oendl;
 					//         if( i_pageNum != pages) {
 
 					// //          int newTop = Lview->Top();
@@ -438,7 +443,7 @@ void Gutenbrowser::ForwardBtn() {
 		}
 		Lview->setFocus();
 
-			//    qDebug("page number %d line number %d", i_pageNum, currentLine);
+            //    odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
 }
 
 
@@ -457,7 +462,7 @@ void Gutenbrowser::BackBtn() {
 						f.at( 0);
 				} else {
 						if(!f.at( pageStopArray[i_pageNum - 1] ))
-								qDebug("File positioned backward did not work");
+                                odebug << "File positioned backward did not work" << oendl;
 				}
 				QString s;
 					//        int sizeLine=0;
@@ -513,7 +518,7 @@ void Gutenbrowser::TopBtn() {
 
 		if(loadCheck) {
 				if( i_pageNum != 0) {
-						qDebug("top");
+                        odebug << "top" << oendl;
 						qApp->processEvents();
 						currentLine = 0;
 						i_pageNum = 1;
@@ -571,11 +576,11 @@ void Gutenbrowser::BeginBtn() {
 				if(lastPage < i_pageNum) {
 						pageStopArray.resize(i_pageNum + 1);
 						pageStopArray[i_pageNum ] = currentFilePos;
-							//             qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
+                            //             odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
 				}
 					//         lastPage =  i_pageNum;  
 				if(  LeftText.find( s_pattern, 0 , TRUE) != -1 || LeftText.find( sPattern2, 0 , TRUE) != -1 ) {
-						qDebug("<<<<<< FOUND IT!! new page number %d, found at %d", i_pageNum, currentFilePos);
+                        odebug << "<<<<<< FOUND IT!! new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
 						break;
 				}
 		}
@@ -621,11 +626,11 @@ void Gutenbrowser::setBookmark() {
 				cfg.setGroup("General");
 				file_name=cfg.readEntry("Current","");
 				qApp->processEvents();
-				qDebug("Settingbook mark "+file_name);
+                odebug << "Settingbook mark "+file_name << oendl;
 
 				cfg.setGroup("Titles");
 				title=cfg.readEntry(file_name,"");
-				qDebug("title is "+ title);
+                odebug << "title is "+ title << oendl;
 
 				cfg.setGroup( "Bookmarks" );
 
@@ -654,11 +659,11 @@ void Gutenbrowser::Bookmark( int itemId) {
 		Config config("Gutenbrowser");
 		config.setGroup( "Bookmarks" );
 
-			//     qDebug("<<<<<< %d, %d", Lview->PageSize(), Lview->lastRow() - Lview->topRow() );
+            //     odebug << "<<<<<< " << Lview->PageSize() << ", " << Lview->lastRow() - Lview->topRow() << "" << oendl;
 
 		QString itemString;
 
-		qDebug("menu item %d", itemId);
+        odebug << "menu item " << itemId << "" << oendl;
 		QString tempTitle;
 		QString s_Bmrkrow;
 		QString s_pageNum;
@@ -700,7 +705,7 @@ void Gutenbrowser::Bookmark( int itemId) {
 				if(lastPage < i_pageNum) {
 						pageStopArray.resize(i_pageNum + 1);
 						pageStopArray[i_pageNum ] = currentFilePos;
-							//             qDebug("new page number %d, found at %d", i_pageNum, currentFilePos);
+                            //             odebug << "new page number " << i_pageNum << ", found at " << currentFilePos << "" << oendl;
 				}
 				if(currentFilePos == bookmarkPosition)
 						break;
@@ -729,7 +734,7 @@ void Gutenbrowser::Bookmark( int itemId) {
 					//        qApp->processEvents();
 		}
 
-		qDebug("bookmark loaded");
+        odebug << "bookmark loaded" << oendl;
 		setCaption(title);
 }
 
@@ -737,14 +742,14 @@ void Gutenbrowser::Bookmark( int itemId) {
 bool Gutenbrowser::load( const char *fileName) {
 
 			//    QCopEnvelope ( "QPE/System", "busy()" );
-			//    qDebug("Title is already set as "+title);
-		qDebug("sizeHint %d pageSize %d", sizeHint().height(),Lview->PageSize() );
+            //    odebug << "Title is already set as "+title << oendl;
+        odebug << "sizeHint " << sizeHint().height() << " pageSize " << Lview->PageSize() << "" << oendl;
 		if( Lview->PageSize() < 4) {
 
 				Lview->setMaximumHeight( sizeHint().height() );
 				Lview->setMinimumHeight( sizeHint().height() );
 				pointSize = Lview->fontInfo().pointSize();
-				qDebug("sizeHint %d point size %d", sizeHint().height(), pointSize);
+                odebug << "sizeHint " << sizeHint().height() << " point size " << pointSize << "" << oendl;
 				if(pointSize < 10)
 						Lview->setFixedVisibleLines(19);
 				else
@@ -762,7 +767,7 @@ bool Gutenbrowser::load( const char *fileName) {
 			//  if (i_pageNum < 1) {
 		i_pageNum = 1;
 			//  }
-		qDebug("ready to open "+o_file);
+        odebug << "ready to open "+o_file << oendl;
 
 		if(f.isOpen()) f.close();
 		f.setName( o_file);
@@ -798,14 +803,14 @@ bool Gutenbrowser::load( const char *fileName) {
 					 currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() );
 
 		Lview->setMaxLines(Lview->PageSize()*2);
-		qDebug("Gulped %d", currentLine);
+        odebug << "Gulped " << currentLine << "" << oendl;
 		setCaption(title);
 		Lview->setAutoUpdate( TRUE);
 
 		Lview->setCursorPosition(0,0,FALSE);
 
 			//    pages = (int)(( Lview->numLines() / Lview->editSize() ) / 2 ) +1;
-			//qDebug("number of pages %d", pages);
+            //odebug << "number of pages " << pages << "" << oendl;
 
 		loadCheck = true;
 		enableButtons(true);
@@ -822,7 +827,7 @@ void Gutenbrowser::Search() {
 
 			//    if( searchDlg->isHidden())
 		{
-				qDebug("Starting search dialog");
+                odebug << "Starting search dialog" << oendl;
 				searchDlg = new SearchDialog( this, "Etext Search", true);
 				searchDlg->setCaption( tr( "Etext Search" ));
 					//        searchDlg->setLabel( "- searches etext");
@@ -958,9 +963,9 @@ void Gutenbrowser::LibraryBtn() {
 
 		QString newestLibraryFile ="pgwhole.zip";
 		QString zipFile;
-			//    qDebug("Local Library is %s ", local_library.latin1());
+            //    odebug << "Local Library is " << local_library << " " << oendl;
 		zipFile="/usr/bin/unzip";
-			//    qDebug("newestLibraryFile is %s ", newestLibraryFile.latin1());
+            //    odebug << "newestLibraryFile is " << newestLibraryFile << " " << oendl;
 		if( QFile::exists( local_library+newestLibraryFile)) {
 				if( QFile::exists(zipFile) ) {
 						UnZipIt(newestLibraryFile);
@@ -989,7 +994,7 @@ void Gutenbrowser::LibraryBtn() {
 				listItemYear = LibraryDlg->DlglistItemYear;
 				listItemTitle = LibraryDlg->DlglistItemTitle;
 				file_name = LibraryDlg->File_Name;
-					//        qDebug("title is being set as "+title);
+                    //        odebug << "title is being set as "+title << oendl;
 				title = listItemTitle;
 
 					//                  config.setGroup( "Proxy" );
@@ -1011,7 +1016,7 @@ void Gutenbrowser::LibraryBtn() {
 									//
 								if( file_name.find(".zip"))
 									{
-											qDebug("Found zip file\n");
+                                            odebug << "Found zip file\n" << oendl;
 												//              QStringList args;
 												//              args="unzip";
 												//              args+="-o";
@@ -1019,7 +1024,7 @@ void Gutenbrowser::LibraryBtn() {
 												//              args+="-d";
 												//              args+=local_library;
 											QString cmd = "/usr/bin/unzip -o " + local_library+file_name + " -d " + local_library;
-											qDebug("Issuing the command "+ cmd);
+                                            odebug << "Issuing the command "+ cmd << oendl;
 												//  unzipProc=new QProcess( this, "unzipProc" );  /// fark that idea!
 												//  unzipProc->start();
 											system(cmd);
@@ -1062,14 +1067,14 @@ void Gutenbrowser::OpenBtn() {
 
 		if( OpenDlg->exec() != 0) {
 				title = OpenDlg->openFileTitle;
-				qDebug("title open as "+title);
+                odebug << "title open as "+title << oendl;
 				file_name = OpenDlg->file;
 				i_pageNum = 1;
 
 				if( !file_name.isEmpty() || file_name.length() > 2 ) {
 						if(showMainList) {
 								showMainList=FALSE;
-								qDebug("ShowMainList is now false");
+                                odebug << "ShowMainList is now false" << oendl;
 								mainList->hide();
 								Lview->show();
 								qApp->processEvents();
@@ -1078,7 +1083,7 @@ void Gutenbrowser::OpenBtn() {
 							//            QCopEnvelope ( "QPE/System", "busy()" );
 						load(file_name);
 				} else {
-						qDebug("file_name is empty!");
+                        odebug << "file_name is empty!" << oendl;
 						if(showMainList) {
 								if(!Lview->isHidden())
 										Lview->hide();
@@ -1244,7 +1249,7 @@ bool Gutenbrowser::getTitle( const char *file ) {
 				if( strcmp(ramble, s_file) == 0) {
 						config.setGroup( "Titles" );
 						title = config.readEntry(ramble, "");
-							//            qDebug("(getTitle)title is being set as "+title);
+                            //            odebug << "(getTitle)title is being set as "+title << oendl;
 				}
 		}
 		return true;
@@ -1446,7 +1451,7 @@ void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
 }
 
 void Gutenbrowser::resizeEvent( QResizeEvent *ev) {
-			//       qDebug("resize: %d,%d\n",ev->size().width(),ev->size().height());
+            //       odebug << "resize: " << ev->size().width() << "," << ev->size().height() << "\n" << oendl;
 
 		if( !LibraryDlg->isHidden())
 				LibraryDlg->resize(ev->size().width(),ev->size().height() );
@@ -1476,7 +1481,7 @@ void Gutenbrowser::doOptions() {
 				brow=optDlg->browserName;
 				Ddir=optDlg->downloadDirEdit->text();
 
-				qDebug("writing library config");
+                odebug << "writing library config" << oendl;
 				Config config("Gutenbrowser");
 				config.setGroup("General");
 
@@ -1493,7 +1498,7 @@ void Gutenbrowser::doOptions() {
 								QString cmd="mkdir -p ";
 								cmd+=Ddir.latin1();
 								system(cmd);
-								qDebug("Making new dir "+cmd);
+                                odebug << "Making new dir "+cmd << oendl;
 								if(Ddir.right(1)!="/") {
 										Ddir+="/";
 								}
@@ -1509,17 +1514,17 @@ void Gutenbrowser::doOptions() {
 						b_queryExit=FALSE;
 
 				if(optDlg->fontDlg-> changedFonts) {
-						qDebug("Setting font");
+                        odebug << "Setting font" << oendl;
 						myFont=optDlg->fontDlg->selectedFont;
 						Lview->setFont( myFont);
 				}
 
 				if(optDlg->useWordWrap_CheckBox->isChecked() ) {
-						qDebug("WORD WRAP is set");
+                        odebug << "WORD WRAP is set" << oendl;
 						Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
 						useWrap=true;
 				} else {
-						qDebug("Word wrap is NOT set");
+                        odebug << "Word wrap is NOT set" << oendl;
 						Lview->setWordWrap(QMultiLineEdit::NoWrap);
 						useWrap=false;
 				}
@@ -1578,8 +1583,8 @@ bool Gutenbrowser::setTitle() {
   /*Calls new fangled network dialog */
 void Gutenbrowser::OnNetworkDialog( const QString &/*networkUrl*/, const QString &/*output*/)
 {
-			//     qDebug(networkUrl);
-			//     qDebug(output);
+            //     odebug << networkUrl << oendl;
+            //     odebug << output << oendl;
 			// #ifndef Q_WS_QWS
 			//     NetworkDialog *NetworkDlg;
 			//     if( networkUrl.length() < 4 ) networkUrl= "http://sailor.gutenberg.org/mirror.sites.html";
@@ -1712,13 +1717,13 @@ void Gutenbrowser::cleanUp(  )
 		QPEApplication::grabKeyboard();
 
 		QPEApplication::ungrabKeyboard();
-			//    qDebug("Cleanup");
+            //    odebug << "Cleanup" << oendl;
 		if(f.isOpen()) f.close();
 }
 
 void Gutenbrowser::fixKeys()
 {
-		qDebug("Attempting to fix keys");
+        odebug << "Attempting to fix keys" << oendl;
 
 }
 
@@ -1772,7 +1777,7 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
 				Config config("Gutenbrowser");
 				config.setGroup( "Files" );
 				QString file = config.readEntry(temp, "");
-				qDebug("About to load");
+                odebug << "About to load" << oendl;
 				if( Lview->isVisible())
 						load(file);
 
@@ -1813,11 +1818,11 @@ void Gutenbrowser::setDocument(const QString & frozenBoogers) {
 		}
 		DocLnk lnk;
 		lnk = DocLnk(frozenBoogers);
-			//    qDebug(lnk.file() );
+            //    odebug << lnk.file() << oendl;
 		title=lnk.comment();
 		load( lnk.file());
 		this->show();
-			//    qDebug(title);
+            //    odebug << title << oendl;
 			//      qApp->processEvents();
 			//      repaint();
 }
@@ -1873,7 +1878,7 @@ void Gutenbrowser::menuEditTitle()
 {
 		int currentItem = mainList->currentItem();
 		QString title_text = mainList->text( currentItem);
-			//qDebug("Selected "+title_text);
+            //odebug << "Selected "+title_text << oendl;
 
 		Config config("Gutenbrowser");
 		config.setGroup( "Files" );
@@ -1887,15 +1892,15 @@ void Gutenbrowser::menuEditTitle()
 				QString s_filename = config.readEntry(fileNum, "" );
 				config.setGroup( "Titles" );
 				QString file_title = config.readEntry( s_filename, "");
-					//qDebug("file_title is "+file_title);
+                    //odebug << "file_title is "+file_title << oendl;
 				if(title_text == file_title ) {
 							//            selFile = s_filename;
-							//qDebug("Edit: "+ file_title );
+                            //odebug << "Edit: "+ file_title << oendl;
 						i=i_numofFiles+1;
 						Edit_Title *titleEdit;
 						titleEdit = new Edit_Title(this,file_title ,TRUE);
 						if(titleEdit->exec() !=0) {
-									//qDebug(titleEdit->newTitle);
+                                    //odebug << titleEdit->newTitle << oendl;
 								config.writeEntry( s_filename, titleEdit->newTitle);
 								mainList->removeItem(currentItem);
 								mainList->insertItem (  Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
@@ -1911,7 +1916,7 @@ void Gutenbrowser::menuEditTitle()
 
 
 bool Gutenbrowser::UnZipIt(const QString &zipFile) {
-		qDebug(zipFile);
+        odebug << zipFile << oendl;
 #ifndef Q_WS_QWS
 		if( QFile::exists( zipFile)) {      // TODO findsome other way of dealingwithzip files.
 				bool isPgWhole=false;
@@ -1923,17 +1928,17 @@ bool Gutenbrowser::UnZipIt(const QString &zipFile) {
 					//          else {
 					//              thatFile=zipFile.left(4);
 					//          }
-					//      qDebug((const char*)local_library.latin1());
+                    //      odebug << (const char*)local_library.latin1() << oendl;
 				QString cmd;
 #if defined(_WS_X11_)
 				if( chdir((const char*)local_library.latin1())!=0)
-						qDebug("chdir failed.");
+                        odebug << "chdir failed." << oendl;
         cmd = "gunzip -S .zip " + local_library+zipFile;
 					//cmd = "gunzip -d " + zipFile /*newestLibraryFile  */+" -d " + local_library;
 #endif
 #ifdef Q_WS_QWS
 				if( chdir((const char*)local_library.latin1())!=0)
-						qDebug("chdir failed.");
+                        odebug << "chdir failed." << oendl;
         cmd = "unzip " + local_library+zipFile;
 					//      cmd = "/usr/bin/unzip -o " + local_library+zipFile +" -d /usr/share/doc/gutenbrowser" ;//+ local_library;
 #endif
@@ -1942,36 +1947,36 @@ bool Gutenbrowser::UnZipIt(const QString &zipFile) {
 																					QMessageBox::Yes, QMessageBox::No);
 				if (exit==QMessageBox::Yes) {
 #if defined(_WS_X11_)//
-						qDebug("Issuing the command "+cmd);
+                        odebug << "Issuing the command "+cmd << oendl;
 						system( cmd);
 						if( QFile::exists(thatFile))
 								remove (thatFile);
 						if(isPgWhole) {
 								if( rename("pgwhole","PGWHOLE.TXT") !=0)
-										qDebug("rename failed");
+                                        odebug << "rename failed" << oendl;
 						} else {
 								if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
-										qDebug("rename failed");
+                                        odebug << "rename failed" << oendl;
 						}
 #endif
 #ifdef Q_WS_QWS
-						qDebug("Issuing the command "+cmd);
+                        odebug << "Issuing the command "+cmd << oendl;
 						system( cmd);
 						if( QFile::exists(thatFile))
 								remove(thatFile);
 						if(isPgWhole) {
 								if( rename("pgwhole","PGWHOLE.TXT") !=0)
-										qDebug("rename failed");
+                                        odebug << "rename failed" << oendl;
 						} else {
 								if( rename(thatFile.left(4),thatFile.left(4)+".txt") !=0)
-										qDebug("rename failed");
+                                        odebug << "rename failed" << oendl;
 						}
 #endif
 							//       remove( zipFile);
 						return true;
 				}
 				else if(exit==QMessageBox::No) {
-							//            qDebug("unzip");
+                            //            odebug << "unzip" << oendl;
 						return false;
 				}
 		}
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
index c9149ac..a226258 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp
@@ -11,15 +11,19 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
+
 //#include "gutenbrowserData.h"
 #include "gutenbrowser.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/fontdatabase.h>
 #include <qpe/menubutton.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qfontinfo.h>
 #include <qtoolbutton.h>
 
@@ -39,7 +43,7 @@ void Gutenbrowser::initSlots() {
 }
 
 void Gutenbrowser::initConfig() {
-//qDebug("Starting configuration.");
+//odebug << "Starting configuration." << oendl;
     QDir library(local_library);
     if ( !library.exists()) {
         library.mkdir(local_library, TRUE);
@@ -57,7 +61,7 @@ void Gutenbrowser::initConfig() {
 // #endif
 
     }
-      //    qDebug( "init file is %s",iniFile.latin1());
+      //    odebug << "init file is " << iniFile << "" << oendl;
 
 #ifdef Q_WS_QWS
     useSplitter=FALSE;
@@ -147,9 +151,9 @@ void Gutenbrowser::initConfig() {
     qExit=config.readEntry("queryExit","TRUE");
     if(qExit=="TRUE") {
         b_queryExit=TRUE;
-//    qDebug("Please query before leaving the library.");
+//    odebug << "Please query before leaving the library." << oendl;
     } else {
-//    qDebug("Please DO NOT query before leaving the library.");
+//    odebug << "Please DO NOT query before leaving the library." << oendl;
         b_queryExit=FALSE;
     }
 // bookmarks
@@ -161,7 +165,7 @@ void Gutenbrowser::initConfig() {
 
 void Gutenbrowser::initMenuBar()
 {
-//    qDebug("Starting menu init.");
+//    odebug << "Starting menu init." << oendl;
       // menuBar entry fileMenu
     menubar = new QPEMenuBar(this);
 
@@ -207,7 +211,7 @@ void Gutenbrowser::initMenuBar()
 
 void Gutenbrowser::initButtonBar()
 {
-//qDebug("Starting buttonbar init.");
+//odebug << "Starting buttonbar init." << oendl;
 
     OpenButton = new QPushButton( this, "OpenButton" );
     OpenButton->setFocusPolicy( QWidget::TabFocus );
@@ -241,7 +245,7 @@ void Gutenbrowser::initButtonBar()
     dictionaryButton->setFocusPolicy( QWidget::TabFocus );
 
     InfoBar = new QPushButton( this, "Info_Bar" );
-//    qDebug("Infobar");
+//    odebug << "Infobar" << oendl;
 //    if(!useSplitter) {
 
     buttonsHidden=FALSE;
@@ -293,7 +297,7 @@ void Gutenbrowser::initView()
 
     QString italic=cfg.readEntry("Italic","FALSE");
     if(italic=="TRUE") {
-        qDebug("Set Italic font");
+        odebug << "Set Italic font" << oendl;
         defaultFont = fdb.font(family,"Regular",i_size,charSet); //workaround
         defaultFont.setItalic(TRUE);
     }
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 6a9b8c0..53e0236 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -14,15 +14,20 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
 
 #include "helpme.h"
 #include "helpwindow.h"
 
+/* OPIE */
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qprogressdialog.h>
 #include <qlayout.h>
 
+/* STD */
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -111,7 +116,7 @@ void HelpMe::help()
 {
     QString msg ;
     msg=QPEApplication::qpeDir()+"help/html/gutenbrowser-index.html"; // or where ever this ends up to be
-qDebug(msg);
+odebug << msg << oendl;
     QString url = "file://"+msg;
     goGetit( url);
 
diff --git a/noncore/apps/opie-gutenbrowser/main.cpp b/noncore/apps/opie-gutenbrowser/main.cpp
index 5c3348c..71c836d 100644
--- a/noncore/apps/opie-gutenbrowser/main.cpp
+++ b/noncore/apps/opie-gutenbrowser/main.cpp
@@ -37,7 +37,7 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
 // //                     {
 // //                     case 'v': // help
 // //                         printf("Gutenbrowser: "VERSION"\n");
-// // //                        qDebug("Gutenbrowser: "VERSION);
+// // //                        odebug << "Gutenbrowser: "VERSION << oendl; 
 // //                           //                      return 0;
 // //                         break;
 // //                     case 't': // current time 19:34:20 04/03/00
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index bd44ce6..0267416 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -18,20 +18,23 @@
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Ui;
 
-#include <stdlib.h>
+/* QT */
 #include <qtextstream.h>
 #include <qfileinfo.h>
 
+/* STD */
 #if defined(_WS_WIN_)
 #include <windows.h>
 #else
 #include <unistd.h>
-#include "sys/stat.h"
+#include <stdlib.h>
+#include <sys/stat.h>
 #endif
 
 OpenEtext::OpenEtext(QWidget *parent, QString name) : QDialog(parent,name,true)
@@ -134,7 +137,7 @@ OpenFileButton->setDown(TRUE);
     if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )  {
       filer = str;
 
-    qDebug("Open file: "+str);
+    odebug << "Open file: "+str << oendl;
 
     //      QStringList::ConstIterator f;
 //      QString fileTemp;
@@ -164,19 +167,19 @@ OpenFileButton->setDown(TRUE);
             if( s_fileName.right(4) == ".zip") { // unzip that sucker....
                 s_fileName = s_fileName.left( s_fileName.length() - 4);
                 if( chdir((const char*)local_library.latin1())!=0)
-                    qDebug("chdir failed.");//                QString cmd = "gunzip -d " + filer + " -d " + local_library;
+                    odebug << "chdir failed." << oendl; //                QString cmd = "gunzip -d " + filer + " -d " + local_library;
                 cmd = "gunzip -S .zip " + filer;
                 fileName = local_library + s_fileName + ".txt";
                 system( cmd);
             }
 // this renames the .txt to .etx!!
             else  /*if( s_fileName.right(4) == ".txt" ||  if( s_fileName.right(4) == ".TXT"))*/ {
-//   qDebug("Filename is "+fileName);
+//   odebug << "Filename is "+fileName << oendl;
                 s_fileName = fileName;
                 s_fileName.replace( s_fileName.length()-3,3,"gtn");//  s_fileName.replace( s_fileName.length()-3,3,"etx");
                 rename(fileName.latin1(),s_fileName.latin1());
                 fileName = s_fileName;
-//  qDebug("Filename is now "+fileName);
+//  odebug << "Filename is now "+fileName << oendl;
             }
         } else
                         fileName = str;
@@ -187,22 +190,22 @@ OpenFileButton->setDown(TRUE);
         name_file = fi.fileName();
         name_file = name_file.left(name_file.length() - 4);
 
-        qDebug("Setting doclink");
+        odebug << "Setting doclink" << oendl;
         DocLnk lnk;
-        qDebug("name is " + name_file);
+        odebug << "name is " + name_file << oendl;
         lnk.setName(name_file); //sets file name
-        qDebug("Title is "+title);
+        odebug << "Title is "+title << oendl;
         lnk.setComment(title);
 
         QListBox_1->clear();
         getTitles();
-        qDebug("Filename is "+fileName);
+        odebug << "Filename is "+fileName << oendl;
         lnk.setFile(fileName); //sets File property
         lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setExec(fileName);
         lnk.setIcon("gutenbrowser/Gutenbrowser");
         if(!lnk.writeLink())
-            qDebug("Writing doclink did not work");
+            odebug << "Writing doclink did not work" << oendl;
 
    } // end of for each file name....
     OpenFileButton->setDown(FALSE);
@@ -219,13 +222,13 @@ bool OpenEtext::FindTitle( QString filename)
 
     QFileInfo fi(filename);
     name = fi.fileName();
-    qDebug("filename to open is " + name);
+    odebug << "filename to open is " + name << oendl;
     QFile indexLib( filename);
         bool findCheck = FALSE;
         //        int Titlenumber=0;
 
     if ( indexLib.open( IO_ReadOnly) ) {
-                qDebug("file opened successfully");
+                odebug << "file opened successfully" << oendl;
         QTextStream indexStream( &indexLib );
         QString target = "Project Gutenberg Etext of";
         QString target2 = "Project Gutenberg Etext";
@@ -239,7 +242,7 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid( indexLine.find(target, 0, TRUE) + (target.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                qDebug("Found the title 1 and it is %s", title.latin1());
+//                odebug << "Found the title 1 and it is " << title << "" << oendl;
 //                              QListBox_1->insertItem ( title);
             }
             if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) {
@@ -247,7 +250,7 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid(  indexLine.find( target2, 0, TRUE ) + ( target2.length()) , indexLine.find("\r", 0, TRUE) );
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                    qDebug("Found the title 2 and it is %s", title.latin1());
+//                    odebug << "Found the title 2 and it is " << title << "" << oendl;
 //                              QListBox_1->insertItem ( title);
             }
             if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) {
@@ -255,20 +258,20 @@ bool OpenEtext::FindTitle( QString filename)
                 title = indexLine.mid( indexLine.find( target3, 0, TRUE) + ( target3.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                qDebug("Found the title 3 and it is %s", title.latin1());
+//                odebug << "Found the title 3 and it is " << title << "" << oendl;
             }
             if( indexLine.find( target4, 0, TRUE) > -1 && !findCheck) {
                 findCheck = TRUE;
                 title = indexLine.mid(  indexLine.find( target4, 0, TRUE) + ( target4.length()) , indexLine.find("\r", 0, TRUE));
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                qDebug("Found the title 4 and it is %s", title.latin1());
+//                odebug << "Found the title 4 and it is " << title << "" << oendl;
             }
         } //endof file
                 indexLib.close();
 
         if( !findCheck || title.length() < 2) {
-            qDebug("Trying hard to find title from GUTINDEX.ALL");
+            odebug << "Trying hard to find title from GUTINDEX.ALL" << oendl;
             title = titleFromLibrary( filename);
             findCheck = TRUE;
         }
@@ -293,7 +296,7 @@ bool OpenEtext::FindTitle( QString filename)
                 i= i_numofFiles+1;
             }
             if(title.length()<3) {
-//                qDebug("title is empty");
+//                odebug << "title is empty" << oendl;
                 title="Unknown";
             }
             config.writeEntry( filename,title);
@@ -343,13 +346,13 @@ QString OpenEtext::titleFromLibrary( QString fileName)
                 title = indexLine.mid( 9, 50);
 //                title = indexLine.mid( 26, indexLine.length() );
                 title = title.stripWhiteSpace ();
-//                qDebug("Finally Found the title and it is\n %s", title.latin1());
+//                odebug << "Finally Found the title and it is\n " << title << "" << oendl;
 //                              QListBox_1->insertItem ( title);
             }
         } //end while loop
     }
     else
-       qDebug("Error opening library index "+ local_index);
+       odebug << "Error opening library index "+ local_index << oendl;
     return title;
 }
 
@@ -414,7 +417,7 @@ void OpenEtext::removeSelection()
         QString file_title = config.readEntry( s_filename, "");
         if(title_text == file_title) {
             rem=i;
-//qDebug("file title to remove is "+file_title);
+//odebug << "file title to remove is "+file_title << oendl;
             selFile = s_filename;
             config.removeEntry( s_filename); //removes file=title
         }
@@ -482,7 +485,7 @@ void  OpenEtext::editTitle() {
 
     int currentItem=QListBox_1->currentItem();
     QString title_text = QListBox_1->text( currentItem);
-//qDebug("Selected "+title_text);
+//odebug << "Selected "+title_text << oendl;
 
     Config config("Gutenbrowser");
     config.setGroup( "Files" );
@@ -496,15 +499,15 @@ void  OpenEtext::editTitle() {
         QString s_filename = config.readEntry(fileNum, "" );
         config.setGroup( "Titles" );
         QString file_title = config.readEntry( s_filename, "");
-//qDebug("file_title is "+file_title);
+//odebug << "file_title is "+file_title << oendl;
         if(title_text == file_title ) {
             selFile = s_filename;
-//qDebug("Edit: "+ file_title );
+//odebug << "Edit: "+ file_title << oendl;
             i=i_numofFiles+1;
             Edit_Title *titleEdit;
             titleEdit = new Edit_Title(this,file_title ,TRUE);
             if(titleEdit->exec() !=0) {
-//qDebug(titleEdit->newTitle);
+//odebug << titleEdit->newTitle << oendl;
                 config.writeEntry( s_filename, titleEdit->newTitle);
                 QListBox_1->removeItem(currentItem);
                 QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), titleEdit->newTitle, currentItem);
diff --git a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
index bfd9c26..8cc83da 100644
--- a/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/optionsDialog.cpp
@@ -13,17 +13,19 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "optionsDialog.h"
-#include <qpe/config.h>
-#include "fontDialog.h"
 
-// #include <unistd.h>
-// #include <stdio.h>
-// #include <stdlib.h>
 
+#include "optionsDialog.h"
+#include "fontDialog.h"
 //#include "ftpsitedlg.h"
 //#include "browserDialog.h"
 //#define Inherited  QDialog
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
 #include <qfont.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -38,6 +40,12 @@
 #ifndef Q_WS_QWS
 #include <qwhatsthis.h>
 #endif
+
+/* STD */
+// #include <unistd.h>
+// #include <stdio.h>
+// #include <stdlib.h>
+
 /*
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
@@ -60,7 +68,7 @@ optionsDialog::optionsDialog( QWidget* parent,  const char* name, bool modal, WF
 
 optionsDialog::~optionsDialog()
 {
-//qDebug("OnExit()");
+//odebug << "OnExit()" << oendl;
 //    writeConfig();
 }
 
@@ -125,11 +133,11 @@ void optionsDialog::getConfig()
     QString qExit=config.readEntry("queryExit","TRUE");
     if(qExit=="TRUE") {
         cb_queryExit->setChecked(TRUE);
-        qDebug("Config Setting    b_qExit=TRUE;");
+        odebug << "Config Setting    b_qExit=TRUE;" << oendl;
         b_qExit=TRUE;
     } else {
         cb_queryExit->setChecked(FALSE);
-        qDebug("ConfigSetting    b_qExit=FALSE;");
+        odebug << "ConfigSetting    b_qExit=FALSE;" << oendl;
         b_qExit=FALSE;
     }
 
@@ -141,7 +149,7 @@ void optionsDialog::getConfig()
 
 //  //  void optionsDialog::setStyle( int index) {
 
-//  //      qDebug("Set style%d",index);
+//  //      odebug << "Set style" << index << "" << oendl;
 //  //  //int styleInt= index;
 //  //   styleChanged=TRUE;
 //  //        if( ComboBoxStyle->currentItem()==0) styleInt=0;//"styleMetal"));
@@ -167,15 +175,15 @@ void optionsDialog::slotQueryExit()
 {
     Config config("Gutenbrowser");
     config.setGroup("General");
-    qDebug("writing queryExit");
+    odebug << "writing queryExit" << oendl;
     if(cb_queryExit->isChecked()) {
         b_qExit=TRUE;
         config.writeEntry("queryExit","TRUE");
-        qDebug("WritingConfig queryExit=TRUE");
+        odebug << "WritingConfig queryExit=TRUE" << oendl;
     } else {
         b_qExit=FALSE;
         config.writeEntry("queryExit","FALSE");
-        qDebug("WritingConfig queryExit=FALSE");
+        odebug << "WritingConfig queryExit=FALSE" << oendl;
     }
     config.write();
 }
@@ -187,7 +195,7 @@ void optionsDialog::slotQueryExit()
 //  }
 
 //  void optionsDialog::lineEditChanged(const QString &editText) {
-//      qDebug(editText);
+//      odebug << editText << oendl;
 //  }
 
 void optionsDialog::changeFonts()