- convert qDebug to odebug

29 files changed, 656 insertions, 585 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
@@ -10,23 +10,27 @@
 //   *   it under the terms of the GNU General Public License as published by  *
 //   *   the Free Software Foundation; either version 2 of the License, or     *
 //   *   (at your option) any later version.                                   *
 //   ***************************************************************************/
 //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>
 
 /*
  *  The dialog will by default be modeless, unless you set 'modal' to
@@ -61,26 +65,26 @@ LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool modal, W
 
 		config.setGroup( "HttpServer" );
 		proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
 
 		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");
 
 		i_binary = 0;
 
 		config.setGroup("SortAuth");
 		if( config.readEntry("authSort", "FALSE") == "TRUE")
 				authBox->setChecked(TRUE);
 
 		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);
 
 		new QPEDialogListener(this);    
 }
 
@@ -96,13 +100,13 @@ LibraryDialog::~LibraryDialog()
 }
 
   /*This groks using PGWHOLE.TXT */
 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 );
 				QString indexLine;
 				while ( !indexStream.atEnd() )  { // until end of file..
 						indexLine = indexStream.readLine();
@@ -118,13 +122,13 @@ void  LibraryDialog::Newlibrary()
 								title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
 								title = title.stripWhiteSpace();
 
 								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);
 										firstName=author.left(finder);
 										lastName=lastName.stripWhiteSpace();
 										firstName=firstName.stripWhiteSpace();
@@ -177,13 +181,13 @@ void LibraryDialog::Library()
 		ListView1->clear();
 		ListView2->clear();
 		ListView3->clear();
 		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 );
 				QString indexLine;
 				qApp->processEvents();
 					//        int jig;
@@ -197,23 +201,23 @@ void LibraryDialog::Library()
 											//                    title = indexLine.mid( 9, 50);
 										file = indexLine.mid(60,12);
 										if(file.left(1).find("[",0,TRUE) != -1)
 												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);
 												lastName=author.right( author.length()-finder);
 												firstName=author.left(finder);
 												lastName=lastName.stripWhiteSpace();
@@ -394,20 +398,20 @@ 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)  {
 
 						}
 						if(checkBox->isChecked () ) {
 								accept();
 						}
@@ -420,38 +424,38 @@ bool  LibraryDialog::download_Etext()
   // might have to use old gpl'd ftp for embedded!!
 		Config cfg("Gutenbrowser");
 		cfg.setGroup("FTPsite");
 		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....
 		NewlistItemFile = DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).left(DlglistItemFile.left(DlglistItemFile.find(".xxx", 1, FALSE)).find("x", 1, FALSE));
 
 		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";
 		}
 		Edir ="etext" +NewlistItemYear;
 		dir= ftp_base_dir + "/etext" +NewlistItemYear+"/";
 		if( ftp_base_dir.find("=",0,true) )
 				ftp_base_dir.remove(  ftp_base_dir.find("=",0,true),1);
 
 		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);
 		networkList.append((const char *)outputFile); 
 		networkList.append((const char *)NewlistItemFile);
 //<< (char *)ftp_host << (char *)dir << (char *)outputFile << (char *)NewlistItemFile;
@@ -459,54 +463,54 @@ bool  LibraryDialog::download_Etext()
 		NetworkDialog *NetworkDlg;
 		NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkList);
 
 		
 		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");
 									//                s_fileName.replace( s_fileName.length()-3,3,"etx");
 								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 ) {
 								setTitle();
 								QFileInfo fi(File_Name);
 								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
 								QMessageBox::message("Note","There was an error\nwith the file");
 				}
 		}
@@ -567,20 +571,20 @@ void LibraryDialog::cancelIt()
 		this->reject();
 }
 
 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");
 		QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
 		int  i_numofFiles = s_numofFiles.toInt();
 		for ( int i = 0; i <= i_numofFiles; i++){
@@ -735,24 +739,24 @@ void LibraryDialog::onButtonSearch()
 				SearchResultsDlg* SearchResultsDialog;
 				SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
 
 				SearchResultsDialog->showMaximized();
 				if( SearchResultsDialog->exec() != 0) {
 						texter = SearchResultsDialog->selText;
-							//           qDebug(texter);
+                            //           odebug << texter << oendl;
 						resultLs= SearchResultsDialog->resultsList;
 						i_berger = 1;
 				}
 				Searchlist.clear();
 
 					//        if(SearchResultsDialog)
 					//        delete SearchResultsDialog;
 				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;
 				}
 				if(searchDlg)
 						delete searchDlg;
@@ -803,13 +807,13 @@ void  LibraryDialog::parseSearchResults( QString resultStr)
   //  //      QString cmd = "gunzip -d " + zipFile /*newestLibraryFile  */+" -d " + local_library;
   //        cmd = "unzip " + zipFile;
   //  #endif
 
   //          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
   //  #if defined(_WS_X11_)
   //      system( cmd);
   //  #endif
@@ -837,13 +841,13 @@ 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);
 		DlglistItemYear = it->text(2);
 		DlglistItemFile = it->text(3);
 
@@ -855,13 +859,13 @@ 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 );
 		QListViewItemIterator it3( ListView3 );
 		QListViewItemIterator it4( ListView4 );
 		QListViewItemIterator it5( ListView5 );
@@ -897,13 +901,13 @@ 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);
 		ListView4->setSorting( index, TRUE);
 		ListView5->setSorting( index, TRUE);
 
@@ -927,13 +931,13 @@ void LibraryDialog::newList()
 		} else {
 				Output *outDlg;
 				buttonNewList->setDown(TRUE);
 				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";
 
 						int result = QMessageBox::warning( this,"Download"
 																							 ,"Ok to use /'wget/' to download\na new library list?\n"
 																							 ,"Yes","No",0,0,1);
@@ -948,13 +952,13 @@ void LibraryDialog::newList()
 								outDlg->OutputEdit->append( tr("Running wget") );
 								outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 								sleep(1);
 								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);
 												outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 										}
 										pclose(fp);
@@ -962,13 +966,13 @@ void LibraryDialog::newList()
 										outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 										qApp->processEvents();
 
 											//                  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;
 											//                  }
 
 								}
 									//               outDlg->close();
 								FindLibrary();
 								if(outDlg) delete outDlg;
@@ -1021,13 +1025,13 @@ bool LibraryDialog::moreInfo()
 				titleString = item->text(0);
 				ListView5->clearSelection();
 				item = 0;
 		}
 		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");
 				titleString.replace( QRegExp("&"), "%20");
 				QString cmd= "http://google.com/search?q="+titleString+"&num=30&sa=Google+Search";
 				cmd="opera "+cmd;
@@ -1045,18 +1049,18 @@ void LibraryDialog::FindLibrary()
 		buttonLibrary->setDown(TRUE);
 
 		qApp->processEvents();
 		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;
 		buttonSearch->setEnabled(TRUE);
 		moreInfoButton->setEnabled(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
@@ -7,32 +7,38 @@
 //  *   it under the terms of the GNU General Public License as published by  *
 //  *   the Free Software Foundation; either version 2 of the License, or     *
 //  *   (at your option) any later version.                                   *
 //  ***************************************************************************/
 // // 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>
 #include <qvaluelist.h>
 #include <qapplication.h>
 #include <qfile.h>
 #include <qstringlist.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
 QProgressBar* ProgressBar1;
 QPushButton* buttonCancel;
 static netbuf *conn = NULL;
 
 static int log_progress(netbuf *ctl, int xfered, void *arg) {
     int fsz = *(int *)arg;
@@ -116,13 +122,13 @@ void NetworkDialog::initDialog() {
 
     connect(buttonOk,SIGNAL(clicked()),this,SLOT(doOk()));
     connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject()));
 //    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();
 		}
 }
 
 void NetworkDialog::timeSlot() {
@@ -140,19 +146,19 @@ void NetworkDialog::timeSlot() {
 //      timerProgess--;
 //      } else if(timerProgess > 1 &&!posTimer){
 //      ProgressBar1->setProgress(timerProgess);
 //      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();
 //      reject();
 }
 
@@ -164,27 +170,27 @@ bool NetworkDialog::downloadFile( QString networkUrl )
     int fsz;
 //        timer->start( 250 , FALSE);
 //        posTimer=TRUE;
 //    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
         if (!FtpConnect( ftp_host.latin1(), &conn)) {
             i=0;
             successDownload=false;
@@ -197,13 +203,13 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             FtpQuit(conn);
             successDownload=false;
             msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn));
             QMessageBox::message("Note",msg);
             return  false;
         }
-        qDebug("Changing directories.");
+        odebug << "Changing directories." << oendl;
         TextLabel3->setText("Changing directories.");
         qApp->processEvents();
         if (!FtpChdir( dir.latin1(), conn )) {
             successDownload=false;
             msg.sprintf("Unable to change directories "+dir+"\n%s",FtpLastResponse(conn));
             QMessageBox::message("Note",msg);
@@ -214,13 +220,13 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //              successDownload=false;
 //              msg.sprintf("Unable to change directories "+dir+"\n%s",FtpLastResponse(conn));
 //              QMessageBox::message("Note",msg);
 //              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) ) {
             msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn));
             QMessageBox::message("Note",msg);
             successDownload=false;
@@ -229,45 +235,45 @@ bool NetworkDialog::downloadFile( QString networkUrl )
         }
         QFile tmp("./.guten_temp");
         QString s, File_Name;
 
         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();
 
                 if (s.contains(s_partialFileName, FALSE)) {
                     QString str = s.right( (s.length()) - (s.find(s_partialFileName, FALSE)) );
 
                     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;
 //                      }
                     
                 }
             }  //end of while loop
             tmp.close();
 //        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();
         if( File_Name.length()>3) {
             if (!FtpSize( File_Name.latin1(), &fsz, FTPLIB_ASCII, conn))
                 fsz = 0;
@@ -290,22 +296,22 @@ bool NetworkDialog::downloadFile( QString networkUrl )
         } else {
             QMessageBox::message("Note","Could not download file "+ File_Name);
             successDownload=false;
             FtpQuit(conn);
             return false;
         }
-        qDebug("Ftp session successful");
+        odebug << "Ftp session successful" << oendl;
         successDownload=TRUE;
         FtpQuit(conn);
         return true;
     } //no network url
     return false;
 }
 
 void NetworkDialog::doOk() {
-		qWarning("Do OK");
+        owarn << "Do OK" << oendl;
     QString loginStr;
     loginStr = "gutenbrowser";
     if ( !ftp_host.isEmpty() )   {
         if( ftp_host.find( "/", ftp_host.length() - 1,TRUE) != -1  &&  ftp_host.find("ftp://",0, TRUE) != -1) {
             TextLabel3->setText( tr( "List remote dir:\n" + ftp_host) );
 //    TextLabel2->setText( tr( "local file to download into: " +localFileName ) );
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
@@ -95,13 +95,13 @@ bool SearchDialog::forward_search() {
 }
 
 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);
 
     QString thisName=name();
     if( thisName.find("Library Search", 0, TRUE) != -1) {
@@ -116,13 +116,13 @@ 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);
 
     emit search_done_signal();
       //this->reject();
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
@@ -7,12 +7,13 @@ copyright 2001 by L.J. Potter ljp@llornkcor.com
 
 #include "optionsDialog.h"
 //#include "fileBrowser.h"
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 using namespace Opie::Ui;
 
 /* QT */
 #include <qlabel.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
@@ -49,13 +50,13 @@ void optionsDialog::BrowseSelected() {
     map.insert(tr("All"), text );
 
     QString str = OFileDialog::getOpenFileName( 2, dir , QString::null, map);
     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++ ) {
 
 //          fileTemp = *f;
 //          fileTemp.right( fileTemp.length()-5);
@@ -73,13 +74,13 @@ 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 {
         config.writeEntry("Preferred", "http://www.prairienet.org/pg");
     }
 
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
@@ -87,23 +87,23 @@ void FontDialog::familyListBoxSlot(const QString & text)
   int sizeInt = sizeComboBox->currentText().toInt();
 
     sizeComboBox->clear();
     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 + " (";
 
 #ifdef BUGGY_SHARP_ZAURUS   
 
 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
 
    for (int i=0; i<nfontsizes; i++) {
        sizeComboBox->insertItem( QString::number(fontsize[i]));
@@ -148,13 +148,13 @@ void FontDialog::populateLists()
 //          defaultFont.setItalic(TRUE);
          families = fdb.families();
 
   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) {
           QStringList styles = fdb.styles( family );
 // string list of styles of our current font family
           styleListBox->insertStringList( styles);
@@ -206,53 +206,53 @@ void FontDialog::changeText()
 {
     if( familyListBox->currentItem() == -1)
         family= familyListBox->text(0);
     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);
     else {
      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);
 //      QStringList styles = fdb.styles( family ); // string list of styles of our current font family
     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);
     cfg.writeEntry("Style",style);
     cfg.writeEntry("Size",size);
     cfg.writeEntry("CharSet",charSet);
 
     if(style.find("Italic",0,TRUE) != -1) {
           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");
 
     MultiLineEdit1->setFont( selectedFont);
     MultiLineEdit1->update();
     changedFonts=TRUE;
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
@@ -8,26 +8,31 @@
 /***************************************************************************
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   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( )
 {
 //printf( "ftpSiteDlg: ListFile is "+ ListFile +"\n" );
 //  initDialog();
@@ -35,13 +40,13 @@ void optionsDialog::ftpSiteDlg( )
 //    ListFile = local_library + "ftpList";
     ListFile = QPEApplication::qpeDir() + "/etc/gutenbrowser";
     QDir dir(ListFile);
     if( !dir.exists())
         dir.mkdir(ListFile,true);
     ListFile+="/ftpList";
-    qDebug("opening "+ListFile);
+    odebug << "opening "+ListFile << oendl;
     if ( QFile(ListFile).exists() ) {
         openSiteList();
     } else {
            switch( QMessageBox::warning( this, "Gutenbrowser",
                                           "Do you want to  download \nan ftp site list?",
                                           QMessageBox::Yes,   QMessageBox::No)) {
@@ -73,21 +78,21 @@ void optionsDialog::getSite()
 //
 //Qhttp stops working at times.... :(
 //    NetworkDialog *NetworkDlg;
 //    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
 
 // 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();
     outDlg->show();
     qApp->processEvents();
     FILE *fp;
@@ -110,13 +115,13 @@ void optionsDialog::getSite()
 }
 
 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 );
 
     if( f.open( IO_ReadWrite )) {
         QTextStream t( &f);
         QString countryName;
@@ -149,17 +154,17 @@ bool optionsDialog::parseFtpList( QString outputFile)
                         ftpSite.remove( ftpSite.find("a>", 0, TRUE) -2, 4);
 
 
                     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";
 
                     ftp_QListBox_1->sort( TRUE );
                     QString winbug="    ";
@@ -187,13 +192,13 @@ bool optionsDialog::parseFtpList( QString outputFile)
     setActiveWindow();
     return true;
 }
 
 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 )) {
         QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully." )) );
     } else {
         QTextStream t( &f);
@@ -227,13 +232,13 @@ void optionsDialog::select_site( const char *index )
 //   ftp://ftp.datacanyon.com/pub/gutenberg/
 
     s_site = 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);
 
 //    config->read();
     Config config("Gutenbrowser");
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
@@ -11,32 +11,36 @@
 ***************************************************************************/
 // http search
 //        http://digital.library.upenn.edu/books/authors.html
 //        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"
 #include "LibraryDialog.h"
   //#include "bookmarksdlg.h"
 #include "optionsDialog.h"
 #include "helpme.h"
 #include "NetworkDialog.h"
 
 #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>
 #include <qvaluelist.h>
 #include <qlabel.h>
 #include <qclipboard.h>
@@ -48,12 +52,13 @@
 #include <qbrush.h>
 #include <qfile.h>
 #include <qfontinfo.h>
 #include <qscrollview.h>
 #include <qpoint.h>
 
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -128,13 +133,13 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 
 				config.setGroup( "Titles" );
 				QString tempTitle = config.readEntry( ramble, "");
 				config.setGroup( tempTitle);
 				int index=config.readNumEntry( "LineNumber", -1 );
 				if( index != -1) {
-							//        qDebug( tempTitle);
+                            //        odebug << tempTitle << oendl;
 						bookmarksMenu->insertItem( tempTitle);
 				}
 		}
 
 			//    QString gutenIndex= local_library + "GUTINDEX.ALL";
 		QString gutenIndex= QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
@@ -151,13 +156,13 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 		chdir(local_library);
 		if(!showMainList) {
 				Lview->setFocus();
 					//          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 {
 				fillWithTitles();
 				mainList->setFocus();
 					//        mainList->setCurrentItem(0);
@@ -166,13 +171,13 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 		writeConfig();
 } //end init
 
 Gutenbrowser::~Gutenbrowser() {
 			//  QPEApplication::grabKeyboard();
 			//  QPEApplication::ungrabKeyboard();
-		qDebug("Exit");
+        odebug << "Exit" << oendl;
 }
 
   /*
 		Google.com search */
 void Gutenbrowser::InfoBarClick() {
 		QString text;
@@ -196,37 +201,37 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 		qApp->processEvents();
 		QString filename = QPEApplication::qpeDir();
 		if(filename.right(1)!="/")
 				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);
 
 		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);
 				outDlg->showMaximized();
 				outDlg->show();
 				qApp->processEvents();
 				FILE *fp;
 				char line[130];
 				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);
 						outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 				}
 				pclose(fp);        
@@ -253,23 +258,23 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 							//                cmd="wget -q "+url+" &";
 						QString tempHtml=local_library+"webster.html";
 						cmd="wget -O "+tempHtml+" -q "+url;
 				}
 
 				chdir(local_library);
-				qDebug("Issuing the sys command: %s", cmd.latin1());
+                odebug << "Issuing the sys command: " << cmd << "" << oendl;
 				system(cmd);
 		}
 }
 
 void Gutenbrowser::toggleButtonIcons( bool useEm) {
 		QString pixDir;
 		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
 				OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
 				ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
 				BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
@@ -378,13 +383,13 @@ void Gutenbrowser::downloadLibIndex() {
 
 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
 			//  QMessageBox::message("Note","Sorry, can't search. No etext is loaded");
 }
 
@@ -401,13 +406,13 @@ void Gutenbrowser::ForwardBtn() {
 				for(int fd=0; fd < pageSize - 1;fd++) {
 						f.readLine(s, 256);
 						if(useWrap)
 								s.replace(QRegExp("\n"),"");
 						insertString+=s;
 						Lview->insertLine( s, -1);
-							//            qDebug(s);
+                            //            odebug << s << oendl;
 						currentLine++;      
 				}
 					//        Lview->insertAt( insertString,0,0, FALSE);
 				currentFilePos = f.at();
 					//        if( i_pageNum != pages) {
 					//        Lview->MultiLine_Ex::pageDown( FALSE);
@@ -420,13 +425,13 @@ void Gutenbrowser::ForwardBtn() {
 					//                currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
 				setStatus();
 				Lview->setCursorPosition( 0, 0, FALSE);
 					//        }
 
 		} else {
-					//         qDebug("bal");
+                    //         odebug << "bal" << oendl;
 					//         if( i_pageNum != pages) {
 
 					// //          int newTop = Lview->Top();
 					//               //      if(Lview->lastRow() > i)
 					//             Lview->ScrollUp(1);
 					//               //      i_pageNum++;
@@ -435,13 +440,13 @@ void Gutenbrowser::ForwardBtn() {
 
 					//         }
 
 		}
 		Lview->setFocus();
 
-			//    qDebug("page number %d line number %d", i_pageNum, currentLine);
+            //    odebug << "page number " << i_pageNum << " line number " << currentLine << "" << oendl;
 }
 
 
 void Gutenbrowser::BackBtn() {
 		if( i_pageNum > 0) {
 				int pageSize= Lview->PageSize();
@@ -454,13 +459,13 @@ void Gutenbrowser::BackBtn() {
 					//                currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
 
 				if(  i_pageNum < 2) {
 						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;
 				Lview->clear();
 					//        QString insertString;
 
@@ -510,13 +515,13 @@ void Gutenbrowser::doBeginBtn() {
 
   // moves text to the very top = 0
 void Gutenbrowser::TopBtn() {
 
 		if(loadCheck) {
 				if( i_pageNum != 0) {
-						qDebug("top");
+                        odebug << "top" << oendl;
 						qApp->processEvents();
 						currentLine = 0;
 						i_pageNum = 1;
 						int pageSize = Lview->PageSize() ;
 						Lview->clear();
 						QString s;
@@ -568,17 +573,17 @@ void Gutenbrowser::BeginBtn() {
 				currentFilePos = f.at();
 
 				i_pageNum = lineNo/pageSize;
 				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;
 				}
 		}
 		if(f.atEnd()) //in case we didnt find anything, we need to show something
 				f.at(0);
 		Lview->clear();
@@ -618,17 +623,17 @@ void Gutenbrowser::setBookmark() {
 				currentFilePos = f.at();
 
 				Config cfg("Gutenbrowser");
 				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" );
 
 				cfg.writeEntry("File Name",file_name);
 				cfg.writeEntry("Page Number",QString::number(i_pageNum) );
 				cfg.writeEntry( "PagePosition", QString::number( pageStopArray[i_pageNum - 1]));
@@ -651,17 +656,17 @@ void Gutenbrowser::setBookmark() {
 void Gutenbrowser::Bookmark( int itemId) {
 
 			//    qApp->processEvents();
 		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;
 		int Bmrkrow=0;
 		int bookmarkPosition = 0;
 
@@ -697,13 +702,13 @@ void Gutenbrowser::Bookmark( int itemId) {
 				currentFilePos = f.at();
 
 				i_pageNum = lineNo/pageSize;
 				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;
 		}
 		if(f.atEnd())
 				f.at(0);
@@ -726,28 +731,28 @@ void Gutenbrowser::Bookmark( int itemId) {
 				showMainList=FALSE;
 				mainList->hide();
 				Lview->show();
 					//        qApp->processEvents();
 		}
 
-		qDebug("bookmark loaded");
+        odebug << "bookmark loaded" << oendl;
 		setCaption(title);
 }
 
 
 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
 						Lview->setFixedVisibleLines( ( (sizeHint().height() / pointSize ) * 2) -2);
 		}
 
@@ -759,13 +764,13 @@ bool Gutenbrowser::load( const char *fileName) {
 		file_name=fileName;
 		QString o_file = 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);
 
 		if ( !f.open( IO_ReadOnly)) {
 				QMessageBox::message( (tr("Note")), (tr("File not opened sucessfully.\n" +o_file)) );
@@ -795,20 +800,20 @@ bool Gutenbrowser::load( const char *fileName) {
 		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() );
 
 		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);
 		if( donateMenu->count() == 3) {
 				donateMenu->insertItem("Current Title", this, SLOT( InfoBarClick() ));
 		}
@@ -819,13 +824,13 @@ bool Gutenbrowser::load( const char *fileName) {
 } // end load
 
 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");
 				connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
 				connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
 
@@ -955,15 +960,15 @@ int Gutenbrowser::doSearch( const QString &s_pattern , bool case_sensitive,  boo
 }
 
 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);
 				}
 				else
 						QMessageBox::message( "Note",( tr("Please install unzip")) );
@@ -986,13 +991,13 @@ void Gutenbrowser::LibraryBtn() {
 		if( LibraryDlg->exec() != 0 ) {
 				listItemNumber = LibraryDlg->DlglistItemNumber;
 				listItemFile =  LibraryDlg->DlglistItemFile;
 				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" );
 					//              if( LibraryDlg->checked == 1) {
 					//                  config.writeEntry("IsChecked", "TRUE");
 					//                  } else {
@@ -1008,21 +1013,21 @@ void Gutenbrowser::LibraryBtn() {
 									//                    printf("\nFile name is now\n");
 									//                    printf(file_name);
 									//                    printf("\n");
 									//
 								if( file_name.find(".zip"))
 									{
-											qDebug("Found zip file\n");
+                                            odebug << "Found zip file\n" << oendl;
 												//              QStringList args;
 												//              args="unzip";
 												//              args+="-o";
 												//              args+=local_library+file_name;
 												//              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);
 											remove( file_name);
 
 									}
@@ -1059,29 +1064,29 @@ void Gutenbrowser::OpenBtn() {
 		OpenEtext* OpenDlg;
 		OpenDlg = new  OpenEtext(this,"OpenDlg");
 		OpenDlg->showMaximized();
 
 		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();
 						}
 						Lview->clear();
 							//            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();
 								qApp->processEvents();
 								if(mainList->isHidden())
 										mainList->show();
@@ -1241,13 +1246,13 @@ bool Gutenbrowser::getTitle( const char *file ) {
 				temp.setNum(i);
 				QString ramble = config.readEntry(temp, "" );
 
 				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;
 }
 
 void Gutenbrowser::searchdone_slot() {
@@ -1443,13 +1448,13 @@ void Gutenbrowser::keyPressEvent( QKeyEvent *e) {
 					//            }
 					//            break;
 		}
 }
 
 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() );
 
 			//    if(  loadCheck == true) {
 			//        ResizeEdits();
@@ -1473,13 +1478,13 @@ void Gutenbrowser::doOptions() {
 				toggleButtonIcons( optDlg->useIcon);
 				ftp_host= optDlg->ftp_host;
 				ftp_base_dir= optDlg->ftp_base_dir;
 				brow=optDlg->browserName;
 				Ddir=optDlg->downloadDirEdit->text();
 
-				qDebug("writing library config");
+                odebug << "writing library config" << oendl;
 				Config config("Gutenbrowser");
 				config.setGroup("General");
 
 				QString dirname= optDlg->downloadDirEdit->text();
 				if(dirname.right(1)!="/")
 						dirname+="/";
@@ -1490,13 +1495,13 @@ void Gutenbrowser::doOptions() {
 						int exit=QMessageBox::information(this, "Note", "Ok, to make a new directory\n"+Ddir+" ?",
 																							QMessageBox::Ok, QMessageBox::Cancel);
 						if (exit==1) {
 								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+="/";
 								}
 								config.writeEntry("DownloadDirectory",Ddir);
 						}
 				}
@@ -1506,23 +1511,23 @@ void Gutenbrowser::doOptions() {
 				if(optDlg->b_qExit==TRUE)
 						b_queryExit=TRUE;
 				else
 						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;
 				}
 		}
 		if(showMainList) {
 				if(!Lview->isHidden())
@@ -1575,14 +1580,14 @@ bool Gutenbrowser::setTitle() {
 			//     config.write();
 		return true;
 }
   /*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";
 			//     NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", TRUE, 0, networkUrl, output);
 			//     if( NetworkDlg->exec() != 0 ) {
 			//     }
@@ -1709,19 +1714,19 @@ void Gutenbrowser::focusOutEvent( QFocusEvent* )
 void Gutenbrowser::cleanUp(  )
 {
 		writeConfig();
 		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;
 
 }
 
 void Gutenbrowser::enableButtons(bool b)
 {
 		BackButton->setEnabled(b);
@@ -1769,13 +1774,13 @@ void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
 				QString temp;
 				temp.setNum( mainList->currentItem() + 1);
 					//    openFileTitle = title;
 				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);
 
 				config.setGroup( title);
 				file_name = config.readEntry("File Name", "");
 				i_pageNum = config.readNumEntry("Page Number", 1);
@@ -1810,17 +1815,17 @@ void Gutenbrowser::setDocument(const QString & frozenBoogers) {
 				if(Lview->isHidden())
 						Lview->show();
 				qApp->processEvents();
 		}
 		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();
 }
 
 void Gutenbrowser::mainListPressed(int mouse, QListBoxItem * , const QPoint & )
 {
@@ -1870,13 +1875,13 @@ void Gutenbrowser::searchGoogle( const QString &tempText) {
 }
 
 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" );
 		QString s_numofFiles = config.readEntry("NumberOfFiles", "0");
 		int  i_numofFiles = s_numofFiles.toInt();
 		QString fileNum;
@@ -1884,21 +1889,21 @@ void Gutenbrowser::menuEditTitle()
 
 				fileNum.setNum(i);
 				config.setGroup( "Files" );
 				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);
 						}
 				}
 		}
@@ -1908,73 +1913,73 @@ 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;
 				QString thatFile;
 				if(zipFile.find("pgwhole",0,TRUE)) {
 						isPgWhole=TRUE;
 						thatFile= local_library +"PGWHOLE.TXT";
 				}
 					//          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
 				int exit=QMessageBox::information(this, "Ok to unzip?",
 																					"Ok to unnzip\n"+ 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;
 				}
 		}
 		else
 				QMessageBox::message( "Note",( tr("Please install unzip in your PATH")) );
 #endif
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
@@ -8,21 +8,25 @@
 /***************************************************************************
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   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>
 
 void Gutenbrowser::initSlots() {
 
     connect(LibraryButton,SIGNAL(released()),SLOT(LibraryBtn()));
@@ -36,13 +40,13 @@ void Gutenbrowser::initSlots() {
     connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp()));
     connect(mainList,SIGNAL(clicked(QListBoxItem *)),SLOT(listClickedSlot(QListBoxItem *)));
     connect(bookmarksMenu,SIGNAL(activated(int)),SLOT(Bookmark(int)));    
 }
 
 void Gutenbrowser::initConfig() {
-//qDebug("Starting configuration.");
+//odebug << "Starting configuration." << oendl;
     QDir library(local_library);
     if ( !library.exists()) {
         library.mkdir(local_library, TRUE);
         QString msg;
 // #ifndef Q_WS_WIN
         msg = "chmod 755 " + local_library;
@@ -54,13 +58,13 @@ void Gutenbrowser::initConfig() {
 //         msg = "chmod 755 " + local_library+"pix";
 //         system(msg);
 //     }
 // #endif
 
     }
-      //    qDebug( "init file is %s",iniFile.latin1());
+      //    odebug << "init file is " << iniFile << "" << oendl;
 
 #ifdef Q_WS_QWS
     useSplitter=FALSE;
     Config config("Gutenbrowser");
 
     config.setGroup( "General" );
@@ -144,27 +148,27 @@ void Gutenbrowser::initConfig() {
 
     config.setGroup("General");
     QString qExit;
     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
 //       config.setGroup("Titles");
 //      QString tmpTitle=config.readEntry(file_name,"");
   
 
 }// end initConfig()
 
 void Gutenbrowser::initMenuBar()
 {
-//    qDebug("Starting menu init.");
+//    odebug << "Starting menu init." << oendl;
       // menuBar entry fileMenu
     menubar = new QPEMenuBar(this);
 
     fileMenu=new QPopupMenu();
     fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"),
                          "Open Local Library...", this, SLOT( OpenBtn()) );
@@ -204,13 +208,13 @@ void Gutenbrowser::initMenuBar()
 
     topLayout->addLayout( menu, 0);
 }
 
 void Gutenbrowser::initButtonBar()
 {
-//qDebug("Starting buttonbar init.");
+//odebug << "Starting buttonbar init." << oendl;
 
     OpenButton = new QPushButton( this, "OpenButton" );
     OpenButton->setFocusPolicy( QWidget::TabFocus );
 
     LibraryButton = new QPushButton( this, "LibraryButton" );
     LibraryButton->setFocusPolicy( QWidget::TabFocus );
@@ -238,13 +242,13 @@ void Gutenbrowser::initButtonBar()
     lastBmkButton->setPopup(bookmarksMenu);
 
     dictionaryButton = new QPushButton( this, "dictionaryButton" );
     dictionaryButton->setFocusPolicy( QWidget::TabFocus );
 
     InfoBar = new QPushButton( this, "Info_Bar" );
-//    qDebug("Infobar");
+//    odebug << "Infobar" << oendl;
 //    if(!useSplitter) {
 
     buttonsHidden=FALSE;
     buttons2->setSpacing(2);
     buttons2->addWidget(OpenButton, 0, AlignCenter);
     buttons2->addWidget(LibraryButton, 0, AlignCenter);
@@ -290,13 +294,13 @@ void Gutenbrowser::initView()
     QString charSet = cfg.readEntry("CharSet", QFont::encodingName( fontInfo.charSet()) );
 
     defaultFont = fdb.font(family,style,i_size,charSet);
 
     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);
     }
 
     Lview->setFont( defaultFont);
     update();
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
@@ -11,21 +11,26 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (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>
 
 HelpMe::HelpMe(QWidget *parent,  QString name ) : QDialog(parent,name)
 {
     local_library = ( QDir::homeDirPath ())+"/Applications/gutenbrowser/";
@@ -108,13 +113,13 @@ void HelpMe::goGetit( QString url)
 }
 
 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);
 
 //       QCopEnvelope e("QPE/Application/helpbrowser", "setDocument(QString)" );
 //       e << msg;
  
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
@@ -34,13 +34,13 @@ OPIE_EXPORT_APP( OApplicationFactory<Gutenbrowser> )
 // //             if( psz[0] == '-' || psz[0] == '/' ) {
 // // // The next character is the option.
 // //                 switch( psz[1] )
 // //                     {
 // //                     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
 // // //                        return 0;
 // //                         break;
 // //                     case 'f': //
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
@@ -15,26 +15,29 @@
 #include "gutenbrowser.h"
 #include "openetext.h"
 #include "editTitle.h"
 
 /* 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)
 {
     local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
     local_index=local_library+"GUTINDEX.ALL";
@@ -131,13 +134,13 @@ OpenFileButton->setDown(TRUE);
 
     QString str = OFileDialog::getOpenFileName( 2, dir , QString::null, map);
 
     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;
 //      for (  f = fileList.begin(); f != fileList.end(); f++ ) {
 //          fileTemp = *f;
 //          fileTemp.right( fileTemp.length()-5);
@@ -161,51 +164,51 @@ OpenFileButton->setDown(TRUE);
             QString s_fileName = zipFile.fileName();
             QString cmd;
 
             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;
 
         FindTitle(fileName);
 
         QFileInfo fi( fileName);
         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);
 }
 
 /*
@@ -216,19 +219,19 @@ bool OpenEtext::FindTitle( QString filename)
     config.setGroup( "Files" );
     QString s_numofFiles = config.readEntry("NumberOfFiles", "0");
     int  i_numofFiles = s_numofFiles.toInt();
 
     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";
         QString target3 = "Project Gutenberg's Etext of";
         QString target4 = "Project Gutenberg's Etext";
         QString indexLine;
@@ -236,42 +239,42 @@ bool OpenEtext::FindTitle( QString filename)
               // until end of file..
             indexLine = indexStream.readLine();
             if(  indexLine.find(target, 0, TRUE) > -1 && !findCheck) {findCheck = TRUE;
                 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) {
                 findCheck = TRUE;
                 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) {
                 findCheck = TRUE;
                 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;
         }
 
         if ( checkConf() == false && findCheck == TRUE) {
 
@@ -290,13 +293,13 @@ bool OpenEtext::FindTitle( QString filename)
                 QString title1 = config.readEntry(ramble, "");
                 if(title1==title)
                     title+="1";
                 i= i_numofFiles+1;
             }
             if(title.length()<3) {
-//                qDebug("title is empty");
+//                odebug << "title is empty" << oendl;
                 title="Unknown";
             }
             config.writeEntry( filename,title);
         }
     } else {
         QString sMsg;
@@ -340,19 +343,19 @@ QString OpenEtext::titleFromLibrary( QString fileName)
 
             if( indexLine.find( target,0,FALSE) > 0 ) {
                 findCheck = TRUE;
                 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;
 }
 
 bool OpenEtext::checkConf()
 {
     QString file = fileName;
@@ -411,13 +414,13 @@ void OpenEtext::removeSelection()
         QString s_filename = config.readEntry(fileNum, "" );
         config.setGroup( "Titles" );
 
         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
         }
     }
     config.setGroup( "Files" );
 
@@ -479,13 +482,13 @@ void OpenEtext::scan() {
 }
 
 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" );
     s_numofFiles = config.readEntry("NumberOfFiles", "0");
     int  i_numofFiles = s_numofFiles.toInt();
     QString fileNum;
@@ -493,21 +496,21 @@ void  OpenEtext::editTitle() {
 
         fileNum.setNum(i);
         config.setGroup( "Files" );
         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
@@ -10,23 +10,25 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (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>
 #include <qlabel.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
@@ -35,12 +37,18 @@
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #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.
  */
 optionsDialog::optionsDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
         : QDialog( parent, name, modal, fl )
@@ -57,13 +65,13 @@ optionsDialog::optionsDialog( QWidget* parent,  const char* name, bool modal, WF
     BrowserDlg();
     FontDialog();
 }
 
 optionsDialog::~optionsDialog()
 {
-//qDebug("OnExit()");
+//odebug << "OnExit()" << oendl;
 //    writeConfig();
 }
 
 /// optionsDialog
 void optionsDialog::doOptions() {
 
@@ -122,29 +130,29 @@ void optionsDialog::getConfig()
 //      if( i_style==10){ styleInt=10; ComboBoxStyle->setCurrentItem(10);}//"styleLacePlus"));
 //  #endif
     config.setGroup("General");
     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;
     }
 
      
       useWordWrap_CheckBox->setChecked( config.readBoolEntry("WordWrap", 1));
       QString downDir=config.readEntry( "DownloadDirectory",local_library);
       downloadDirEdit->setText(downDir);
 } // end 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"));
 //  //        if( ComboBoxStyle->currentItem()==1) styleInt=1;//"styleWindows") );
 //  //        if( ComboBoxStyle->currentItem()==2) styleInt=2;//"stylePlatinum"));
 //  //  //      if( ComboBoxStyle->currentItem()==2) styleInt=2;//"styleCDE") );
@@ -164,33 +172,33 @@ void optionsDialog::getConfig()
 //  //  }
 
 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();
 }
 
 
 //  void optionsDialog::slotUseSplit()
 //  {
 
 //  }
 
 //  void optionsDialog::lineEditChanged(const QString &editText) {
-//      qDebug(editText);
+//      odebug << editText << oendl;
 //  }
 
 void optionsDialog::changeFonts() 
 {
     changedFonts=TRUE;
 }
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp
index 2f8cdc3..06f44a4 100644
--- a/noncore/apps/opie-reader/Aportis.cpp
+++ b/noncore/apps/opie-reader/Aportis.cpp
@@ -25,20 +25,20 @@ CList<Bkmk>* Aportis::getbkmklist()
 	{
 	    CList<Bkmk>* t = new CList<Bkmk>;
 	    for (int i = nRecs; i < nRecs2; i++)
 	    {
 		char name[17];
 		name[16] = '\0';
-//		qDebug("Record:%d, Length:%u",i,recordlength(i));
+//		odebug << "Record:" << i << ", Length:" << recordlength(i) << "" << oendl; 
 		gotorecordnumber(i);
 		fread(name,1,16,fin);
 		unsigned long lcn;
 		fread(&lcn,sizeof(lcn),1,fin);
 		lcn ^= 0xa5a5a5a5;
 		lcn = SwapLong(lcn);
-//		qDebug("Bookmark:%s:%u", name,lcn);
+//		odebug << "Bookmark:" << name << ":" << lcn << "" << oendl; 
 		tchar tname[17];
 		memset(tname, 0, sizeof(tname));
 		for (int i = 0; name[i] != 0; i++)
 		{
 		    tname[i] = name[i] ^ 0xa5;
 		}
@@ -118,13 +118,13 @@ int Aportis::OpenFile(const char *src)
   if (peanutfile)
   {
       
       PeanutHeader hdr0;
       gotorecordnumber(0);
       fread(&hdr0, sizeof(hdr0), 1, fin);
-//      qDebug("Version:%x", ntohs(hdr0.Version));
+//      odebug << "Version:" << ntohs(hdr0.Version) << "" << oendl; 
       if (hdr0.Version && 0x0200)
       {
 	  bCompressed = 2;
       }
       else
       {
@@ -179,13 +179,13 @@ int Aportis::OpenFile(const char *src)
   // this is the main record buffer
   // it knows how to stretch to accomodate the decompress
   currentrec = 0;
   cbptr = 0;
   outptr = 0;
   refreshbuffer();
-//  qDebug("Number of records:[%u,%u]", nRecs, nRecs2);
+//  odebug << "Number of records:[" << nRecs << "," << nRecs2 << "]" << oendl; 
   return ret;
 }
 
 int Aportis::getch()
 {
   if (bCompressed == 1)
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 16bc1f1..480c240 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -214,21 +214,21 @@ CList<Bkmk>* BkmkFile::readall()
 	{
 	    switch(newmagic & 0xff)
 	    {
 		case 6:
 		    isUpgraded = false;
 		    bl = readall00(read06);
-//		    qDebug("Correct version!");
+//		    odebug << "Correct version!" << oendl; 
 		    break;
 		case 5:
 		    isUpgraded = true;
 		    bl = readall00(read05);
-//		    qDebug("Known version!");
+//		    odebug << "Known version!" << oendl; 
 		    break;
 		default:
-//		    qDebug("Unknown version!");
+//		    odebug << "Unknown version!" << oendl; 
 		    isUpgraded = true;
 		    bl = readall00(read05);
 	    }
 	}
     }
     return bl;
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp
index 4fbab93..68391b8 100644
--- a/noncore/apps/opie-reader/BuffDoc.cpp
+++ b/noncore/apps/opie-reader/BuffDoc.cpp
@@ -29,23 +29,23 @@ linkType BuffDoc::hyperlink(unsigned int n, QString& wrd)
     }
     return bRet;
 }
 
 void BuffDoc::locate(unsigned int n)
 {
-  //  //qDebug("BuffDoc:locating:%u",n);
+  //  //odebug << "BuffDoc:locating:" << n << "" << oendl; 
     lastword.empty();
   lastsizes[0] = laststartline = n;
 #ifdef NEWLINEBREAK
     lastispara = true;
 #else
     lastispara = false;
 #endif
   //    tchar linebuf[1024];
   if (exp != NULL) exp->locate(n);
-  //  //qDebug("BuffDoc:Located");
+  //  //odebug << "BuffDoc:Located" << oendl; 
 }
 
 #ifdef NEWLINEBREAK
 bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
 {
     bool moreleft = true;
@@ -185,13 +185,13 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, unsigned char _border)
       *buff = lastword;
       cs = lastword.laststyle();
       w -= buff->leftMargin() + buff->rightMargin();
       margindone = true;
   }
   else buff->empty();
-//  //qDebug("Buff:%s Lastword:%s", (const char*)toQString(buff->data()), (const char*)toQString(lastword.data()));
+//  //odebug << "Buff:" << toQString(buff->data()) << " Lastword:" << toQString(lastword.data()) << "" << oendl; 
   lastcheck = len = buff->length();
   unsigned int slen = buff->width(len);
   if (slen > w)
     {
       for ( ; len > 1; len--)
 	{
@@ -319,14 +319,14 @@ bool BuffDoc::getline(CDrawBuffer* buff, int wth, int cw, unsigned char _border)
     buff->resize();
     return (ch != UEOF);
 }
 
 int BuffDoc::openfile(QWidget* _parent, const char *src)
 {
-    //    //qDebug("BuffDoc:Openfile:%s", src);
-    //    //qDebug("Trying aportis %x",exp);
+    //    //odebug << "BuffDoc:Openfile:" << src << "" << oendl; 
+    //    //odebug << "Trying aportis " << exp << "" << oendl; 
     if (exp != NULL) delete exp;
     lastword.empty();
     lastsizes[0] = laststartline = 0;
 #ifdef NEWLINEBREAK
     lastispara = true;
 #else
@@ -375,38 +375,38 @@ int BuffDoc::openfile(QWidget* _parent, const char *src)
 	exp = new CPlucker;
 	ret = exp->openfile(src);
     }
     if (ret != 0)
     {
 	delete exp;
-	//qDebug("Trying ppms");
+	//odebug << "Trying ppms" << oendl; 
 	exp = new ppm_expander;
 	ret = exp->openfile(src);
     }
     if (ret != 0)
     {
 	delete exp;
 	exp = new Text;
-//		//qDebug("Trying text");
+//		//odebug << "Trying text" << oendl; 
 	ret = exp->openfile(src);
     }
 
     if (ret != 0)
     {
 	delete exp;
 	QMessageBox::information(_parent, PROGNAME, "Unknown file compression type","Try another file");
 	return ret;
     }
-    //        //qDebug("Doing final open:%x:%x",exp,filt);
+    //        //odebug << "Doing final open:" << exp << ":" << filt << "" << oendl; 
 
     lastword.empty();
     lastsizes[0] = laststartline = 0;
 #ifdef NEWLINEBREAK
     lastispara = true;
 #else
     lastispara = false;
 #endif
     exp->locate(0);
     filt->setsource(exp);
-    //        //qDebug("BuffDoc:file opened");
+    //        //odebug << "BuffDoc:file opened" << oendl; 
     return 0;
 }
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index ec36fb2..b137ac3 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -37,13 +37,13 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
   len = i;
 }
 
 CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
 {
   int i;
-//  //qDebug("Trying 2");
+//  //odebug << "Trying 2" << oendl; 
   len = rhs.len;
   m_maxstyle = rhs.m_maxstyle;
   m_ascent = rhs.m_ascent;
   m_descent = rhs.m_descent;
   m_lineSpacing = rhs.m_lineSpacing;
   m_lineExtraSpacing = rhs.m_lineExtraSpacing;
@@ -55,13 +55,13 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
   {
       segs.push_back(*iter);
   }
   for (i = 0; rhs[i] != '\0'; i++) (*this)[i] = rhs[i];
   (*this)[i] = '\0';
   len = i;
-//  //qDebug("Tried 2");
+//  //odebug << "Tried 2" << oendl; 
   return *this;
 }
 
 CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp)
 {
   int i;
@@ -205,13 +205,13 @@ int CDrawBuffer::width(int numchars, bool onscreen, int scwidth, unsigned char _
 			    spacesofar += nexttoadd;
 			    lastspace = nsp;
 			}
 			else
 			{
 			    QString nstr = str.mid(lastspace+1, nsp-lastspace);
-//			    qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+//			    odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl; 
 			    int lw = fm.width(nstr);
 			    cx += lw;
 			    lastspace = nsp;
 			}
 		    }
 		    QString nstr = str.right(str.length()-1-lastspace);
@@ -314,13 +314,13 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
     {
 	textend++;
 	int end = (textend != segs.end()) ? textend->start : len;
 	CStyle currentstyle = textstart->style;
 	QFont f((currentstyle.isMono() && fc->hasCourier()) ? fc->fixedfontname() : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
 //	f.setUnderline(currentstyle.isUnderline());
-//	if (currentstyle.isUnderline()) qDebug("UNDERLINE");
+//	if (currentstyle.isUnderline()) odebug << "UNDERLINE" << oendl; 
 	_p->setFont(f);
 	QString str = text.mid(textstart->start, end-textstart->start);
 #if defined(OPIE) || !defined(USEQPE)
 	_p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/100));
 #else
 	_p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/10));
@@ -405,23 +405,23 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
 			{
 			    if (nsp+textstart->start >= nonspace)
 			    {
 				spacenumber++;
 				int nexttoadd = (extraspace*spacenumber+spaces/2)/spaces - spacesofar;
 				QString nstr = str.mid(lastspace+1, nsp-lastspace);
-//			    qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+//			    odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl; 
 				int lw = fm.width(nstr);
 				_p->drawText( cx, _y+voffset, nstr);
 				cx += lw+nexttoadd;
 				spacesofar += nexttoadd;
 				lastspace = nsp;
 			    }
 			    else
 			    {
 				QString nstr = str.mid(lastspace+1, nsp-lastspace);
-//			    qDebug("str:%s: last:%d new:%d nstr:%s:", (const char*)str, lastspace, nsp, (const char*)nstr);
+//			    odebug << "str:" << str << ": last:" << lastspace << " new:" << nsp << " nstr:" << nstr << ":" << oendl; 
 				int lw = fm.width(nstr);
 				_p->drawText( cx, _y+voffset, nstr);
 				cx += lw;
 				lastspace = nsp;
 			    }
 			}
@@ -467,20 +467,20 @@ linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
     do
     {
 	textend++;
 	end = (textend != segs.end()) ? textend->start : len;
 	currentstyle = textstart->style;
 /*
-	if (currentstyle.isPicture()) qDebug("Passed thru picture");
-	if (currentstyle.getLink()) qDebug("Passed thru link");
-	//qDebug("islink:%d - %d", numchars, end);
+	if (currentstyle.isPicture()) odebug << "Passed thru picture" << oendl; 
+	if (currentstyle.getLink()) odebug << "Passed thru link" << oendl; 
+	//odebug << "islink:" << numchars << " - " << end << "" << oendl; 
 */
 	textstart = textend;
     }
     while (textend != segs.end() && end <= numchars);
-//    if (currentstyle.isPicture()) qDebug("Clicked on picture");
+//    if (currentstyle.isPicture()) odebug << "Clicked on picture" << oendl; 
     if (currentstyle.getPictureLink())
     {
 	tgt = currentstyle.getPictureLinkData();
 	return ePicture;
     }
     if (currentstyle.getLink())
@@ -536,11 +536,11 @@ void CDrawBuffer::resize()
 	m_descent += xt;
 	m_lineSpacing += xt;
     }
     if (m_bSop)
     {
 	int xt = ((segs.begin()->style.getExtraSpace()+fc->getextraspace())*fc->getsize(segs.begin()->style)+5)/10;
-//	qDebug("ExtraSpace:%d", xt);
+//	odebug << "ExtraSpace:" << xt << "" << oendl; 
 	m_ascent += xt;
 	m_lineSpacing += xt;
     }
 }
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index d64abb4..b356ba5 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -77,37 +77,37 @@ QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *nam
   bdblspce(false),
   btight(false),
   bindenter(0),
   m_fm(NULL)
 {
   init();
-//  //  qDebug("Load_file(1)");
+//  //  odebug << "Load_file(1)" << oendl; 
   load_file((const tchar*)filename);
 }
 */
 
 /*
 void QTReader::mouseMoveEvent(QMouseEvent* _e)
 {
 
     mouseUpOn = !(_e->pos().x() == -1);
 
-    qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y());
+    odebug << "MouseMove:[" << _e->pos().x() << ", " << _e->pos().y() << "]" << oendl; 
 }
 */
 long QTReader::real_delay()
 {
     return ( 8976 + m_delay ) / ( m_linespacing * m_linespacing );
 }
 
 void QTReader::mousePressEvent( QMouseEvent* _e )
 {
     buffdoc.unsuspend();
     if (_e->button() == RightButton)
     {
-//	qDebug("MousePress");
+//	odebug << "MousePress" << oendl; 
 	mouseUpOn = false;
 	if (m_swapmouse)
 	{
 		int lineno = 0;
 		int ht = textarray[0]->lineSpacing();
 		while ((ht < _e->y()) && (lineno < numlines))
@@ -314,35 +314,35 @@ void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouse
 	{
 	    int i = first+1;
 	    while (QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
 	    if (t->width(i, true, width(), m_border) > tgt)
 	    {
 		wrd = toQString(t->data()+first, i - first);
-//			    qDebug("Got %s", (const char *)wrd);
+//			    odebug << "Got " << (const char *)wrd << "" << oendl; 
 		break;
 	    }
 	    while (!QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
 	    if ((*t)[i] == 0) break;
 	    first = i;
 	}		
     }
     if (!wrd.isEmpty())
     {
-//	qDebug("Selected:%s", (const char*)wrd);
+//	odebug << "Selected:" << wrd << "" << oendl; 
 	emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
     }
 }
 
 void QTReader::mouseReleaseEvent( QMouseEvent* _e )
 {
     buffdoc.unsuspend();
     if (_e->button() == LeftButton)
     {
 	if (mouseUpOn)
 	{
-//	    qDebug("MouseRelease");
+//	    odebug << "MouseRelease" << oendl; 
 	    if (_e->x() > width() - m_border)
 	    {
 		locate(buffdoc.startSection()+((buffdoc.endSection()-buffdoc.startSection())*_e->y()+height()/2)/height());
 		return;
 	    }
 	    if (textarray[0] != NULL)
@@ -391,13 +391,13 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
 			    locate(pagelocate());
 			}
 			return;
 		    }
 		    case ePicture:
 		    {
-//			qDebug("Picture:%x", tgt);
+//			odebug << "Picture:" << tgt << "" << oendl; 
 			QImage* pm = buffdoc.getPicture(tgt);
 			if (pm != NULL)
 			{
 			    emit OnShowPicture(*pm);
 			    delete pm;
 			}
@@ -407,13 +407,13 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
 			}
 			return;
 		    }
 		    case eNone:
 			break;
 		    default:
-//			qDebug("Unknown linktype");
+//			odebug << "Unknown linktype" << oendl; 
 			return;
 		}
 		if (m_swapmouse)
 		    processmousepositionevent(_e);
 		else
 		    processmousewordevent(startpos, startoffset, _e, lineno);
@@ -693,13 +693,13 @@ void QTReader::setautoscroll(bool _sc)
 	CDrawBuffer* reusebuffer = textarray[numlines];
 	if (reusebuffer == NULL || reusebuffer->eof()) return;
 	m_autoScroll = true;
 #ifdef _SCROLLPIPE
 	if (!m_pipetarget.isEmpty())
 	{
-//	    qDebug("Opening pipe to %s", (const char*)m_pipetarget);
+//	    odebug << "Opening pipe to " << m_pipetarget << "" << oendl; 
 	    m_pipeout = popen((const char*)m_pipetarget, "w");
 	    m_isPaused = false;
 	}
 #endif
 	autoscroll();
 #ifdef USEQPE
@@ -820,53 +820,53 @@ void QTReader::setfont()
 }
 
 void QTReader::drawFonts( QPainter *p )
 {
     if (bDoUpdates)
     {
-//	qDebug("How refreshing...");
+//	odebug << "How refreshing..." << oendl; 
 	if (buffdoc.empty()) return;
 	setfont();
 	if (m_lastwidth != width())
 	{
-//	    qDebug("Not Optimised %d", m_lastwidth);
+//	    odebug << "Not Optimised " << m_lastwidth << "" << oendl; 
 	    m_lastwidth = width();
 	    m_lastheight = height();
 	    buffdoc.setwidth(m_lastwidth-2*m_border);
 	    locate(pagelocate());
-//	    qDebug("Not Optimised %d", m_lastwidth);
+//	    odebug << "Not Optimised " << m_lastwidth << "" << oendl; 
 	}
 	else 
 	{
 	    int newht = height();
 	    if (m_lastheight > newht)
 	    {
-//		qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht);
+//		odebug << "Optimised < " << numlines << " " << m_lastheight << " " << newht << "" << oendl; 
 		int ypos = 0;
 		for (int i = 0; i < numlines; i++)
 		{
 		    if ((ypos += textarray[i]->lineSpacing()) > newht)
 		    {
 			numlines = i;
 			jumpto(mylastpos = locnarray[i+1]);
 			break;
 		    }
 		}
-//		qDebug("Optimised < %d", numlines);
+//		odebug << "Optimised < " << numlines << "" << oendl; 
 		m_lastheight = newht;
 	    }
 	    else if (m_lastheight < newht)
 	    {
-//		qDebug("Optimised > %d", numlines);
+//		odebug << "Optimised > " << numlines << "" << oendl; 
 		int ypos = 0;
 		for (int i = 0; i <= numlines; i++)
 		{
 		    ypos += textarray[i]->lineSpacing();
 		}
 		fillbuffer(numlines+1, ypos, newht);
-//		qDebug("Optimised > %d", numlines);
+//		odebug << "Optimised > " << numlines << "" << oendl; 
 	    }
 	    if (numlines > 0)
 	    {
 		int ypos = textarray[0]->ascent();
 		textarray[0]->render( p, ypos, m_bMonoSpaced, m_charWidth, width(), m_border);
 //		int last = (m_showlast) ? numlines : numlines-1;
@@ -894,13 +894,13 @@ void QTReader::drawFonts( QPainter *p )
 
 	emit OnRedraw();
     }
 /*
     else
     {
-	qDebug("Not so refreshing...");
+	odebug << "Not so refreshing..." << oendl; 
     }
 */
 }
 
 QString QTReader::firstword()
 {
@@ -1025,13 +1025,13 @@ void QTReader::paintEvent( QPaintEvent * )
 // Moves the button group to the upper right corner
 // of the widget.
 
 /*
 void QTReader::resizeEvent( QResizeEvent * )
 {
-//  //  qDebug("resize:(%u,%u)", width(), height());
+//  //  odebug << "resize:(" << width() << "," << height() << ")" << oendl; 
   //    bgroup->move( width()-bgroup->width(), 0 );
 }
 */
 
 //
 // Create and display our widget.
@@ -1050,17 +1050,17 @@ int main( int argc, tchar **argv )
 
 
 bool QTReader::locate(unsigned long n) {
   //printf("Locate\n");
     buffdoc.unsuspend();
   buffdoc.locate(n);
-//  //  qDebug("&buffdoc.located");
+//  //  odebug << "&buffdoc.located" << oendl; 
   fillbuffer();
-//  //  qDebug("&Buffer filled");
+//  //  odebug << "&Buffer filled" << oendl; 
   update();
-//  //  qDebug("&Located");
+//  //  odebug << "&Located" << oendl; 
   return true;
 }
 
 unsigned int QTReader::screenlines()
 {
   //  int linespacing = (tight) ? m_ascent : m_ascent+m_descent;
@@ -1114,18 +1114,18 @@ bool QTReader::fillbuffer(int reuse, int ht, int newht)
     
     return true;
 }
 
 void QTReader::dopagedn()
 {
-//    qDebug("HEIGHT(2):%d", m_lastheight);
+//    odebug << "HEIGHT(2):" << m_lastheight << "" << oendl; 
     buffdoc.unsuspend();
     int skip = 0, ypos = 0;
     if (locate() != mylastpos)
     {
-////	qDebug("Jumping to %u", mylastpos);
+////	odebug << "Jumping to " << mylastpos << "" << oendl; 
 	jumpto(mylastpos);
     }
     CDrawBuffer* reusebuffer = textarray[numlines];
     if (reusebuffer != NULL && reusebuffer->eof()) return;
     if (reusebuffer != NULL)
     {
@@ -1310,19 +1310,19 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
   if (buffdoc.openfile(this,newfile) == 0)
   {
       m_lastfile = newfile;
       buffdoc.setwidth(m_lastwidth-2*m_border);
       bRC = true;
       buffdoc.setContinuous(m_continuousDocument);
-//      //  qDebug("buffdoc.openfile done");
+//      //  odebug << "buffdoc.openfile done" << oendl; 
       locate(lcn);
-//      //  qDebug("buffdoc.locate done");
+//      //  odebug << "buffdoc.locate done" << oendl; 
     }
   setfilter(getfilter());
   update();
-//  //  qDebug("Updated");
+//  //  odebug << "Updated" << oendl; 
   return bRC;
 }
 
 void QTReader::lineDown()
 {
     int ypos = 0;
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b072854..f18cb59 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -14,78 +14,79 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+
 #include "useqpe.h"
-#include <qregexp.h>
-#include <qclipboard.h>
-#include <qwidgetstack.h>
+#include "QTReader.h"
+#include "GraphicWin.h"
+#include "Bkmks.h"
+#include "cbkmkselector.h"
+#include "infowin.h"
+#include "ToolbarPrefs.h"
+#include "Prefs.h"
+#include "CAnnoEdit.h"
+#include "QFloatBar.h"
+#include "FixedFont.h"
+#include "URLDialog.h"
+#include "QTReaderApp.h"
+#include "CDrawBuffer.h"
+#include "Filedata.h"
+#include "opie.h"
+#include "names.h"
+#include "CEncoding_tables.h"
+#include "CloseDialog.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#ifdef USEQPE
+#include <qpe/menubutton.h>
+#include <qpe/fontdatabase.h>
+#include <qpe/global.h>
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
+#endif
+
+/* QT */
 #ifdef USEQPE
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #endif
+#include <qregexp.h>
+#include <qclipboard.h>
+#include <qwidgetstack.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
-#ifdef USEQPE
-#include <qpe/menubutton.h>
-#include <qpe/fontdatabase.h>
-#endif
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qobjectlist.h>
-#ifdef USEQPE
-#include <qpe/global.h>
-#include <qpe/applnk.h>
-#endif
 #include <qfileinfo.h>
-#include <stdlib.h> //getenv
 #include <qprogressbar.h>
-#ifdef USEQPE
-#include <qpe/config.h>
-#endif
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
-#ifdef USEQPE
-#include <qpe/qcopenvelope_qws.h>
-#endif
-#include "QTReader.h"
-#include "GraphicWin.h"
-#include "Bkmks.h"
-#include "cbkmkselector.h"
-#include "infowin.h"
-#include "ToolbarPrefs.h"
-#include "Prefs.h"
-#include "CAnnoEdit.h"
-#include "QFloatBar.h"
-#include "FixedFont.h"
-#include "URLDialog.h"
-//#include <qpe/fontdatabase.h>
+
+/* STD */
+#include <stdlib.h> //getenv
+
 
 #ifdef USEQPE
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include "fileBrowser.h"
 #else
 #include "qfiledialog.h"
 #endif
 
-#include "QTReaderApp.h"
-#include "CDrawBuffer.h"
-#include "Filedata.h"
-#include "opie.h"
-#include "names.h"
-#include "CEncoding_tables.h"
-#include "CloseDialog.h"
-
 bool CheckVersion(int&, int&, char&);
 
 #ifdef _WINDOWS
 #define PICDIR "c:\\uqtreader\\pics\\"
 #else
 #ifdef USEQPE
@@ -122,13 +123,13 @@ void QTReaderApp::listBkmkFiles()
     bkmkselector->setText("Cancel");
 #ifndef USEQPE
     int cnt = 0;
 
     QDir d = QDir::home();                      // "/"
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 		d = QDir::home();
 		d.mkdir(APPDIR);
 		d.cd(APPDIR);
     }
 
 
@@ -143,13 +144,13 @@ void QTReaderApp::listBkmkFiles()
 
         while ( (fi=it.current()) ) {           // for each file...
 
 		    bkmkselector->insertItem(fi->fileName());
 		    cnt++;
 
-			//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+            //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
             ++it;                               // goto next list element
         }
 
 #else /* USEQPE */
     int cnt = 0;
     DIR *d;
@@ -211,14 +212,14 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
       fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL)
 {
 	m_url_clipboard = false;
 	m_url_localfile = false;
 	m_url_globalfile = false;
 		ftime(&m_lastkeytime);
-////  qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
-////  qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
+////  odebug << "Application directory = " << (const tchar *)QPEApplication::documentDir() << "" << oendl;
+////  odebug << "Application directory = " << (const tchar *)Global::applicationFileName("uqtreader" << "" << oendl;
 
     m_bcloseDisabled = true;
     m_disableesckey = false;
     pBkmklist = NULL;
     pOpenlist = NULL;
 //    doc = 0;
@@ -240,13 +241,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   }
   else if (rot.contains("Rot270"))
   {
       m_rot = 270;
   }
 
-//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+//  odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl;
 */
   m_autogenstr = "^ *[A-Z].*[a-z] *$";
 
 #ifdef USEQPE
     setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );
 #else
@@ -257,19 +258,19 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 //    menubar = new QToolBar( this );
 #ifdef USEQPE
   Config config( APPDIR );
 #else
     QDir d = QDir::home();                      // "/"
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 		d = QDir::home();
 		d.mkdir(APPDIR);
 		d.cd(APPDIR);
     }
     QFileInfo fi(d, INIFILE);
-//    qDebug("Path:%s", (const char*)fi.absFilePath());
+//    odebug << "Path:" << fi.absFilePath() << "" << oendl;
     Config config(fi.absFilePath());
 #endif
     config.setGroup("Toolbar");
     m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
     m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
     m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
@@ -353,24 +354,24 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 
     editorStack->addWidget( importSelector, get_unique_id() );
 
     // don't need the close visible, it is redundant...
     importSelector->setCloseVisible( FALSE );
 */    
-//    qDebug("Reading file list");
+//    odebug << "Reading file list" << oendl;
     readfilelist();
 
     reader = new QTReader( editorStack );
 
     reader->bDoUpdates = false;
 
 #ifdef USEQPE
     ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
 #endif
 
-//    qDebug("Reading config");
+//    odebug << "Reading config" << oendl;
 //  Config config( APPDIR );
   config.setGroup( "View" );
   m_debounce = config.readNumEntry("Debounce", 0);
 #ifdef USEQPE
   m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
 #else
@@ -766,13 +767,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     regBar->hide();
 
     m_fontBar = new QToolBar( "Autogen", this, QMainWindow::Top, TRUE );
 
     m_fontBar->setHorizontalStretchable( TRUE );
 
-//    qDebug("Font selector");
+//    odebug << "Font selector" << oendl;
     m_fontSelector = new QComboBox(false, m_fontBar);
     m_fontBar->setStretchableWidget( m_fontSelector );
     {
 #ifndef USEQPE
 	QFontDatabase f;
 #else
@@ -798,23 +799,23 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     m_fontBar->hide();
     m_fontVisible = false;
 #ifdef USEMSGS
     connect(qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
 	     this, SLOT( msgHandler(const QCString&,const QByteArray&) ) );
 #endif
-//    qDebug("Initing");
+//    odebug << "Initing" << oendl;
   reader->init();
-//    qDebug("Inited");
+//    odebug << "Inited" << oendl;
 //    m_buttonAction[m_spaceTarget]->setOn(true);
-//    qDebug("fonting");
+//    odebug << "fonting" << oendl;
     do_setfont(reader->m_fontname);
     if (!reader->m_lastfile.isEmpty())
     {
-//	qDebug("doclnk");
+//  odebug << "doclnk" << oendl;
 //	doc = new DocLnk(reader->m_lastfile);
-//	qDebug("doclnk done");
+//  odebug << "doclnk done" << oendl;
 	if (pOpenlist != NULL)
 	{
 
 /*
 	    int ind = 0;
 	    Bkmk* p = (*pOpenlist)[ind];
@@ -828,30 +829,30 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 	    {
 		p = iter.pContent();
 		if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
 		{
 		    break;
 		}
-//		qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+//      odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl;
 		p = NULL;
 	    }
 	    if (p != NULL)
 	    {
-//	qDebug("openfrombkmk");
+//  odebug << "openfrombkmk" << oendl;
 		if (!openfrombkmk(p))
 		    showEditTools();
 	    }
 	    else
 	    {
-//	qDebug("openfile");
+//  odebug << "openfile" << oendl;
 		openFile( reader->m_lastfile );
 	    }
 	}
 	else
 	{
-//	    qDebug("Openfile 2");
+//      odebug << "Openfile 2" << oendl;
 	    if (!reader->m_lastfile.isEmpty())
 		openFile( reader->m_lastfile );
 	}
     }
     else
     {
@@ -867,13 +868,13 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     if (CheckVersion(major, bkmktype, minor))
     {
 	config.writeEntry("Major", major);
 	config.writeEntry("BkmkType", bkmktype);
 	config.writeEntry("Minor", (int)minor);
     }
-//    qDebug("finished update");
+//    odebug << "finished update" << oendl;
 }
 
 void QTReaderApp::addtoolbars(Config* config)
 {
     config->setGroup("Toolbar");
 
@@ -1025,20 +1026,20 @@ QToolBar* QTReaderApp::filebar()
 {
     if (fileBar == NULL)
     {
 	switch (m_tbpol)
 	{
 	    case cesSingle:
-//		qDebug("Setting filebar to menubar");
+//      odebug << "Setting filebar to menubar" << oendl;
 		fileBar = menubar;
 		break;
 	    default:
-		qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
 	    case cesMenuTool:
 	    case cesMultiple:
-//		qDebug("Creating new file bar");
+//      odebug << "Creating new file bar" << oendl;
 		fileBar = new QToolBar("File", this, m_tbposition);
 		break;
 	}
 //	fileBar->setHorizontalStretchable( true );
     }
     return fileBar;
@@ -1050,13 +1051,13 @@ QToolBar* QTReaderApp::viewbar()
 	switch (m_tbpol)
 	{
 	    case cesMultiple:
 		viewBar = new QToolBar("View", this, m_tbposition);
 		break;
 	    default:
-		qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
 	    case cesSingle:
 	    case cesMenuTool:
 		viewBar = fileBar;
 		break;
 	}
     }
@@ -1066,21 +1067,21 @@ QToolBar* QTReaderApp::navbar()
 {
     if (navBar == NULL)
     {
 	switch (m_tbpol)
 	{
 	    case cesMultiple:
-//		qDebug("Creating new nav bar");
+//      odebug << "Creating new nav bar" << oendl;
 		navBar = new QToolBar("Navigation", this, m_tbposition);
 		break;
 	    default:
-		qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
 	    case cesSingle:
 	    case cesMenuTool:
 		navBar = fileBar;
-//		qDebug("Setting navbar to filebar");
+//      odebug << "Setting navbar to filebar" << oendl;
 		break;
 	}
     }
     return navBar;
 }
 QToolBar* QTReaderApp::markbar()
@@ -1090,13 +1091,13 @@ QToolBar* QTReaderApp::markbar()
 	switch (m_tbpol)
 	{
 	    case cesMultiple:
 		markBar = new QToolBar("Marks", this, m_tbposition);
 		break;
 	    default:
-		qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
 	    case cesSingle:
 	    case cesMenuTool:
 		markBar = fileBar;
 		break;
 	}
     }
@@ -1124,13 +1125,13 @@ void QTReaderApp::suspend() { reader->suspend(); }
 
 #ifdef USEMSGS
 void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
 {
     QString msg = QString::fromUtf8(_msg);
 
-////    qDebug("Received:%s", (const char*)msg);
+////    odebug << "Received:" << msg << "" << oendl;
 
     QDataStream stream( _data, IO_ReadOnly );
     if ( msg == "info(QString)" )
     {
 	QString info;
 	stream >> info;
@@ -1478,13 +1479,13 @@ void QTReaderApp::setfullscreen(bool sfs)
     reader->bDoUpdates = true;
     reader->update();
 }
 
 void QTReaderApp::buttonActionSelected(QAction* _a)
 {
-////    qDebug("es:%x : %s (%u)", _a, (const char *)(_a->text()), ActNameToInt(_a->text()));
+////    odebug << "es:" << _a << " : " << (const char *)(_a->text()) << " (" << ActNameToInt(_a->text()) << ")" << oendl;
     m_spaceTarget = ActNameToInt(_a->text());
 }
 
 QTReaderApp::~QTReaderApp()
 {
 }
@@ -1560,13 +1561,13 @@ void QTReaderApp::fileClose()
 void QTReaderApp::updatefileinfo()
 {
     if (reader->m_string.isEmpty()) return;
     if (reader->m_lastfile.isEmpty()) return;
     tchar* nm = fromQString(reader->m_string);
     tchar* fl = fromQString(reader->m_lastfile);
-//    qDebug("Lastfile:%x", fl);
+//    odebug << "Lastfile:" << fl << "" << oendl;
     bool notadded = true;
     if (pOpenlist == NULL) pOpenlist = new CList<Bkmk>;
     else
     {
 	for (CList<Bkmk>::iterator iter = pOpenlist->begin(); iter != pOpenlist->end(); iter++)
 	{
@@ -1574,32 +1575,32 @@ void QTReaderApp::updatefileinfo()
 	    {
 		iter->value(reader->pagelocate());
 		unsigned short dlen;
 		unsigned char* data;
 		CFiledata fd(iter->anno());
 		reader->setSaveData(data, dlen, fd.content(), fd.length());
-//		qDebug("Filedata(1):%u, %u", fd.length(), dlen);
+//      odebug << "Filedata(1):" << fd.length() << ", " << dlen << "" << oendl;
 //		getstate(data, dlen);
 		iter->setAnno(data, dlen);
 		notadded = false;
 		delete [] data;
 		break;
 	    }
 	}
     }
-//    qDebug("Added?:%x", notadded);
+//    odebug << "Added?:" << notadded << "" << oendl;
     if (notadded)
     {
 	struct stat fnstat;
 	stat((const char *)reader->m_lastfile, &fnstat);
 	CFiledata fd(fnstat.st_mtime, fl);
 	unsigned short dlen;
 	unsigned char* data;
 	reader->setSaveData(data, dlen, fd.content(), fd.length());
 	pOpenlist->push_front(Bkmk(nm, data, dlen, reader->pagelocate()));
-//	qDebug("Filedata(2):%u, %u", fd.length(), dlen);
+//  odebug << "Filedata(2):" << fd.length() << ", " << dlen << "" << oendl;
 	delete [] data;
     }
     delete [] nm;
     delete [] fl;
 }
 
@@ -1608,13 +1609,13 @@ void QTReaderApp::fileOpen()
 /*
     menu->hide();
     fileBar->hide();
     if (regVisible) regBar->hide();
     if (searchVisible) searchBar->hide();
 */
-//    qDebug("fileOpen");
+//    odebug << "fileOpen" << oendl;
 //    if (!reader->m_lastfile.isEmpty())
     updatefileinfo();
     fileOpen2();
 }
 
 void QTReaderApp::fileOpen2()
@@ -1649,13 +1650,13 @@ void QTReaderApp::fileOpen2()
 	{
 	    openFile(fn);
 	}
 	reader->setFocus();
     }
 //    reader->refresh();
-//    qDebug("HEIGHT:%d", reader->m_lastheight);
+//    odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl;
 }
 
 QString QTReaderApp::usefilebrowser()
 {
 #ifndef USEQPE
     QString s( QFileDialog::getOpenFileName( reader->m_lastfile, QString::null, this ) );
@@ -1669,13 +1670,13 @@ QString QTReaderApp::usefilebrowser()
 
     QString fn;
     if (fb->exec())
     {
 	fn = fb->getCurrentFile();
     }
-//    qDebug("Selected %s", (const char*)fn);
+//    odebug << "Selected " << fn << "" << oendl;
     delete fb;
     showEditTools();
     return fn;
 #endif
 }
 
@@ -1800,13 +1801,13 @@ void QTReaderApp::showprefs()
 		reader->bstriphtml = true;
 		break;
 	    case 4:
 		reader->bpeanut = true;
 		break;
 	    default:
-		qDebug("Format out of range");
+        odebug << "Format out of range" << oendl;
 	}
 	reader->bdepluck = prefwin->Depluck();
 	reader->bdejpluck = prefwin->Dejpluck();
 	reader->setContinuous(prefwin->Continuous());
 
 	m_spaceTarget = (ActionTypes)prefwin->spaceAction();
@@ -1860,13 +1861,13 @@ void QTReaderApp::showtoolbarprefs()
     CBarPrefs* prefwin = new CBarPrefs(APPDIR, !m_bFloatingDialog, this);
 #else
 	QFileInfo fi;
     QDir d = QDir::home();                      // "/"
 	if ( !d.cd(APPDIR) )
 	{                       // "/tmp"
-		qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+        owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
 		d = QDir::home();
 		d.mkdir(APPDIR);
 		d.cd(APPDIR);
 	}
 	fi.setFile(d, INIFILE);
     CBarPrefs* prefwin = new CBarPrefs(fi.absFilePath(), !m_bFloatingDialog, this);
@@ -1897,13 +1898,13 @@ void QTReaderApp::showtoolbarprefs()
 	Config config( APPDIR );
 #else
 	QFileInfo fi;
     QDir d = QDir::home();                      // "/"
 	if ( !d.cd(APPDIR) )
 	{                       // "/tmp"
-		qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+        owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
 		d = QDir::home();
 		d.mkdir(APPDIR);
 		d.cd(APPDIR);
 	}
 	fi.setFile(d, INIFILE);
 	Config config( fi.absFilePath() );
@@ -2172,13 +2173,13 @@ void QTReaderApp::editFind()
   searchStack->push(new searchrecord("",reader->pagelocate()));
 #endif
 }
 
 void QTReaderApp::findNext()
 {
-//  //  qDebug("findNext called\n");
+//  //  odebug << "findNext called\n" << oendl;
 #ifdef __ISEARCH
   QString arg = searchEdit->text();
 #else
   QRegExp arg = searchEdit->text();
 #endif
   CDrawBuffer test(&(reader->m_fontControl));
@@ -2268,18 +2269,18 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
 	      findClose();
 	      pbar->hide();
 	      reader->locate(pos);
 	      return false;
 	  }
       }
-//      qDebug("Found it at %u:%u", pos, offset);
+//      odebug << "Found it at " << pos << ":" << offset << "" << oendl;
       pbar->hide();
-//      qDebug("Hid");
+//      odebug << "Hid" << oendl;
       reader->locate(pos+offset);
-//      qDebug("Loacted");
-//      qDebug("page up");
+//      odebug << "Loacted" << oendl;
+//      odebug << "page up" << oendl;
       ret = true;
   }
   else
   {
 	      if (QMessageBox::warning(this, "Can't find", searchEdit->text(), 1, 2) == 2)
 		  pos = searchStart;
@@ -2330,13 +2331,13 @@ void QTReaderApp::search()
     findNext();
 }
 #endif
 
 void QTReaderApp::openFile( const QString &f )
 {
-//    qDebug("File:%s", (const char*)f);
+//    odebug << "File:" << f << "" << oendl;
 //    openFile(DocLnk(f));
 //}
 //
 //void QTReaderApp::openFile( const DocLnk &f )
 //{
   clear();
@@ -2377,25 +2378,25 @@ void QTReaderApp::resizeEvent(QResizeEvent* e)
 	showFullScreen();
     }
 }
 */
 void QTReaderApp::handlekey(QKeyEvent* e)
 {
-//    qDebug("Keypress event");
+//    odebug << "Keypress event" << oendl;
     timeb now;
     ftime(&now);
     unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
     if (etime < m_debounce)
     {
 	return;
     }
     m_lastkeytime = now;
     switch(e->key())
     {
 	case Key_Escape:
-//	    qDebug("escape event");
+//      odebug << "escape event" << oendl;
 	    if (m_disableesckey)
 	    {
 		m_disableesckey = false;
 	    }
 	    else
 	    {
@@ -2404,13 +2405,13 @@ void QTReaderApp::handlekey(QKeyEvent* e)
 		{
 		    m_actFullscreen->setOn(false);
 		    e->accept();
 		}
 		else
 		{
-//		qDebug("escape action");
+//      odebug << "escape action" << oendl;
 		    doAction(m_escapeTarget, e);
 		}
 	    }
 	    break;
 	case Key_Space:
 	{
@@ -2503,17 +2504,17 @@ void QTReaderApp::showEditTools()
 	m_fontBar->hide();
 //	showNormal();
 	showFullScreen();
     }
     else
     {
-//	qDebug("him");
+//  odebug << "him" << oendl;
 #ifdef USEQPE
 	Global::hideInputMethod();
 #endif
-//	qDebug("eb");
+//  odebug << "eb" << oendl;
 	menubar->show();
 	if (fileBar != NULL) fileBar->show();
 	if (viewBar != NULL) viewBar->show();
 	if (navBar != NULL) navBar->show();
 	if (markBar != NULL) markBar->show();
 	mb->show();
@@ -2529,26 +2530,26 @@ void QTReaderApp::showEditTools()
 #ifdef USEQPE
 	    Global::showInputMethod();
 #endif
 		regBar->show();
 	}
 	if (m_fontVisible) m_fontBar->show();
-//	qDebug("sn");
+//  odebug << "sn" << oendl;
 	showNormal();
-//	qDebug("sm");
+//  odebug << "sm" << oendl;
 #ifdef USEQPE
 	showMaximized();
 #endif
 //	setCentralWidget(reader);
     }
 
-//    qDebug("uc");
+//    odebug << "uc" << oendl;
     updateCaption();
-//    qDebug("rw");
+//    odebug << "rw" << oendl;
     editorStack->raiseWidget( reader );
-//    qDebug("sf");
+//    odebug << "sf" << oendl;
     reader->setFocus();
     reader->refresh();
 }
 /*
 void QTReaderApp::save()
 {
@@ -2611,13 +2612,13 @@ void QTReaderApp::setDocument(const QString& fileref)
     openFile(fileref);
 //    showEditTools();
 }
 
 void QTReaderApp::closeEvent( QCloseEvent *e )
 {
-//    qDebug("Close event");
+//    odebug << "Close event" << oendl;
     if (m_fullscreen)
     {
 	m_fullscreen = false;
 	showEditTools();
 	e->accept();
     }
@@ -2628,13 +2629,13 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
     else
     {
 	if (editorStack->visibleWidget() == reader)
 	{
 	    if ((m_escapeTarget != cesNone) && m_bcloseDisabled)
 	    {
-//	qDebug("Close disabled");
+//  odebug << "Close disabled" << oendl;
 		m_bcloseDisabled = false;
 		e->ignore();
 	    }
 	    else
 	    {
 		if (m_fontVisible)
@@ -2706,13 +2707,13 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
     int cnt = 0;
     if (plist != NULL)
       {
 	for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
 	  {
 #ifdef _UNICODE
-//	      qDebug("Item:%s", (const char*)toQString(i->name()));
+//        odebug << "Item:" << toQString(i->name()) << "" << oendl;
 	    bkmkselector->insertItem(toQString(i->name()));
 #else
 	    bkmkselector->insertItem(i->name());
 #endif
 	    cnt++;
 	  }
@@ -2735,15 +2736,15 @@ void QTReaderApp::do_autogen()
 }
 
 void QTReaderApp::do_regedit()
 {
 //    fileBar->hide();
     reader->bDoUpdates = false;
-//    qDebug("Showing regbar");
+//    odebug << "Showing regbar" << oendl;
   regBar->show();
-//    qDebug("Showing kbd");
+//    odebug << "Showing kbd" << oendl;
 #ifdef USEQPE
   Global::showInputMethod();
 #endif
   regVisible = true;
   regEdit->setFocus();
 //  qApp->processEvents();
@@ -2753,16 +2754,16 @@ void QTReaderApp::do_regedit()
 
 bool QTReaderApp::openfrombkmk(Bkmk* bk)
 {
     QString fn = toQString(
 	CFiledata(bk->anno()).name()
 	);
-//	qDebug("fileinfo");
+//  odebug << "fileinfo" << oendl;
     if (!fn.isEmpty() && QFileInfo(fn).isFile())
     {
-//	qDebug("Opening");
+//  odebug << "Opening" << oendl;
 	openFile(fn);
 	struct stat fnstat;
 	stat((const char *)reader->m_lastfile, &fnstat);
 	
 	if (CFiledata(bk->anno()).date()
 	    != fnstat.st_mtime)
@@ -2778,13 +2779,13 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
 	    reader->putSaveData(svdata, svlen);
 //	    setstate(svdata, svlen);
 	    if (svlen != 0)
 	    {
 		QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
 	    }
-//	    qDebug("updating");
+//      odebug << "updating" << oendl;
 //	    showEditTools();
 	    reader->locate(bk->value());
 	}
 	return true;
     }
     else
@@ -2809,13 +2810,13 @@ void QTReaderApp::gotobkmk(int ind)
 	}
 	break;
 	case cGotoBkmk:
 	    reader->locate((*pBkmklist)[ind]->value());
 	    break;
 	case cDelBkmk:
-////	    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+////        odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl;
 	    pBkmklist->erase(ind);
 	    m_fBkmksChanged = true;
 //	    pBkmklist->sort();
 	    break;
 	case cRmBkmkFile:
 		{
@@ -2909,13 +2910,13 @@ void QTReaderApp::gotobkmk(int ind)
 		QMessageBox::information(this, PROGNAME, "Couldn't open input");
 	    }
 
 /*
 	    CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
 	    int ret = f->exec();
-	    qDebug("Return:%d", ret);
+        odebug << "Return:" << ret << "" << oendl;
 	    DocLnk* doc = f->getDoc();
 	    if (doc != NULL)
 	    {
 		FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
 		QString rt;
 		rt = "<html><body>\n";
@@ -2929,17 +2930,17 @@ void QTReaderApp::gotobkmk(int ind)
 		if ( doc->name().isEmpty() )
 		{
 		    doc->setName(bkmkselector->text(ind));
 		}
 		FileManager fm;
 		fm.saveFile( *doc, rt );
-		qDebug("YES");
+        odebug << "YES" << oendl;
 	    }
 	    else
 	    {
-		qDebug("NO");
+        odebug << "NO" << oendl;
 	    }
 	    delete f;
 */
 
 #endif /* USEQPE */
 	}
@@ -3006,13 +3007,13 @@ void QTReaderApp::do_regaction()
 #ifdef _SCROLLPIPE
       case cSetPipeTarget:
 	  do_setpipetarget(regEdit->text());
 	  break;
 #endif
       case cSetConfigName:
-//	  qDebug("Saving config");
+//    odebug << "Saving config" << oendl;
 	  do_saveconfig(regEdit->text(), false);
 	  break;
   }
 //  reader->restore();
 //    fileBar->show();
   reader->setFocus();
@@ -3098,45 +3099,45 @@ void QTReaderApp::setfontHelper(const QString& lcn, int size)
 	reader->ChangeFont(size);
     }
 }
 
 void QTReaderApp::do_setencoding(int i)
 {
-//    qDebug("setencoding:%d", i);
+//    odebug << "setencoding:" << i << "" << oendl;
     if (m_fontAction == cChooseEncoding)
     {
 	reader->setencoding(i);
     }
     reader->refresh();
     m_fontBar->hide();
     m_fontVisible = false;
-//    qDebug("showedit");
+//    odebug << "showedit" << oendl;
     if (reader->isVisible()) showEditTools();
-//    qDebug("showeditdone");
+//    odebug << "showeditdone" << oendl;
 }
 
 void QTReaderApp::do_setfont(const QString& lcn)
 {
     if (m_fontAction == cChooseFont)
     {
 	setfontHelper(lcn);
     }
     reader->refresh();
     m_fontBar->hide();
     m_fontVisible = false;
-//    qDebug("showedit");
+//    odebug << "showedit" << oendl;
     //if (reader->isVisible())
     showEditTools();
-//    qDebug("showeditdone");
+//    odebug << "showeditdone" << oendl;
 }
 
 void QTReaderApp::do_autogen(const QString& regText)
 {
     unsigned long fs, ts;
     reader->sizes(fs,ts);
-//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+//  //  odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl;
   m_autogenstr = regText;
   QRegExp re(regText);
   CBuffer buff;
   if (pBkmklist != NULL) delete pBkmklist;
   pBkmklist = new CList<Bkmk>;
   m_fBkmksChanged = true;
@@ -3177,13 +3178,13 @@ void QTReaderApp::do_autogen(const QString& regText)
   pbar->hide();
   reader->refresh();
 }
 
 void QTReaderApp::saveprefs()
 {
-//    qDebug("saveprefs");
+//    odebug << "saveprefs" << oendl;
 //  reader->saveprefs("uqtreader");
 //    if (!m_loadedconfig)
 	do_saveconfig( APPDIR, true );
 
 /*    
     Config config( APPDIR );
@@ -3258,17 +3259,17 @@ void QTReaderApp::saveprefs()
     savefilelist();
 }
 
 /*
 void QTReaderApp::oldFile()
 {
-//  qDebug("oldFile called");
+//  odebug << "oldFile called" << oendl;
   reader->setText(true);
-//  qDebug("settext called");
+//  odebug << "settext called" << oendl;
   showEditTools();
-//  qDebug("showedit called");
+//  odebug << "showedit called" << oendl;
 }
 */
 
 /*
 void info_cb(Fl_Widget* o, void* _data)
 {
@@ -3338,16 +3339,16 @@ void QTReaderApp::readfilelist()
 		d.cd(APPDIR);
 		QFileInfo fi(d, ".openfiles");
     BkmkFile bf((const char *)fi.absFilePath());
 #else /* USEQPE */
     BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"));
 #endif /* USEQPE */
-//    qDebug("Reading open files");
+//    odebug << "Reading open files" << oendl;
     pOpenlist = bf.readall();
-//    if (pOpenlist != NULL) qDebug("...with success");
-//    else qDebug("...without success!");
+//    if (pOpenlist != NULL) odebug << "...with success" << oendl;
+//    else odebug << "...without success!" << oendl;
 }
 
 void QTReaderApp::savefilelist()
 {
     if (pOpenlist != NULL)
     {
@@ -3356,13 +3357,13 @@ void QTReaderApp::savefilelist()
 		d.cd(APPDIR);
 		QFileInfo fi(d, ".openfiles");
 	BkmkFile bf((const char *)fi.absFilePath(), true);
 #else /* USEQPE */
 	BkmkFile bf((const char *)Global::applicationFileName(APPDIR,".openfiles"), true);
 #endif /* USEQPE */
-//	qDebug("Writing open files");
+//  odebug << "Writing open files" << oendl;
 	bf.write(*pOpenlist);
     }
 }
 
 void QTReaderApp::readbkmks()
 {
@@ -3466,13 +3467,13 @@ void QTReaderApp::showAnnotation()
     editorStack->raiseWidget( m_annoWin );
     m_annoWin->setFocus();
 }
 
 void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString& line)
 {
-////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+////    odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl;
 
     if (m_doClipboard)
     {
 	QClipboard* cb = QApplication::clipboard();
 	cb->setText(wrd);
 #ifdef USEQPE
@@ -3516,13 +3517,13 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
     {
 	e->ignore();
     }
     else
     {
 	e->accept();
-//	qDebug("Accepted");
+//  odebug << "Accepted" << oendl;
 	switch (a)
 	{
 	    case cesOpenFile:
 	    {
 		fileOpen();
 	    }
@@ -3579,13 +3580,13 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
 		gotoStart();
 		break;
 	    case cesEndDoc:
 		gotoEnd();
 		break;
 	    default:
-		qDebug("Unknown ActionType:%u", a);
+        odebug << "Unknown ActionType:" << a << "" << oendl;
 		break;
 	}
     }
 }
 
 void QTReaderApp::setTwoTouch(bool _b) { reader->setTwoTouch(_b); }
@@ -3597,13 +3598,13 @@ void QTReaderApp::SaveConfig()
     regEdit->setText(reader->m_string);
     do_regedit();
 }
 
 void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
 {
-//    qDebug("do_saveconfig:%s", (const char*)_txt);
+//    odebug << "do_saveconfig:" << _txt << "" << oendl;
 #ifdef USEQPE
     QString configname;
     Config::Domain dom;
 
     if (full)
     {
@@ -3620,44 +3621,44 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
     config.setGroup( "View" );
 
 #else
 	QFileInfo fi;
 	if (full)
 	{
-//	    qDebug("full:%s", (const char*)_txt);
+//      odebug << "full:" << _txt << "" << oendl;
 	    QDir d = QDir::home();                      // "/"
 		if ( !d.cd(_txt) )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+            owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
 			d = QDir::home();
 			d.mkdir(_txt);
 			d.cd(_txt);
 		}
 		fi.setFile(d, INIFILE);
 	}
 	else
 	{
 	    QDir d = QDir::home();                      // "/"
 		if ( !d.cd(APPDIR) )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 			d = QDir::home();
 			d.mkdir(APPDIR);
 			d.cd(APPDIR);
 		}
 		if ( !d.cd("configs") )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
 			d = QDir::home();
 			d.cd(APPDIR);
 			d.mkdir("configs");
 			d.cd("configs");
 		}
 		fi.setFile(d, _txt);
 	}
-//	qDebug("Path:%s", (const char*)fi.absFilePath());
+//  odebug << "Path:" << fi.absFilePath() << "" << oendl;
 	Config config(fi.absFilePath());
 #endif
 
 
     config.writeEntry( "StripCr", reader->bstripcr );
     config.writeEntry( "AutoFmt", reader->bautofmt );
@@ -3931,32 +3932,32 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
 	QFileInfo fi;
 	if (full)
 	{
 	    QDir d = QDir::home();                      // "/"
 		if ( !d.cd(_txt) )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+            owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
 			d = QDir::home();
 			d.mkdir(_txt);
 			d.cd(_txt);
 		}
 		fi.setFile(d, INIFILE);
 	}
 	else
 	{
 	    QDir d = QDir::home();                      // "/"
 		if ( !d.cd(APPDIR) )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 			d = QDir::home();
 			d.mkdir(APPDIR);
 			d.cd(APPDIR);
 		}
 		if ( !d.cd("configs") )
 		{                       // "/tmp"
-			qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
 			d = QDir::home();
 			d.mkdir("configs");
 			d.cd("configs");
 		}
 		fi.setFile(d, _txt);
 	}
@@ -4058,19 +4059,19 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
     bkmkselector->setText("Cancel");
 #ifndef USEQPE
     int cnt = 0;
 
     QDir d = QDir::home();                      // "/"
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 	d = QDir::home();
 	d.mkdir(APPDIR);
 	d.cd(APPDIR);
     }
     if ( !d.cd(tgtdir) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+        owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl;
 	d = QDir::home();
 	d.mkdir(tgtdir);
 	d.cd(tgtdir);
     }
     d.setFilter( QDir::Files | QDir::NoSymLinks );
 //        d.setSorting( QDir::Size | QDir::Reversed );
@@ -4081,13 +4082,13 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
 
     while ( (fi=it.current()) ) {           // for each file...
   
 	bkmkselector->insertItem(fi->fileName());
 	cnt++;
 			
-	//qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+    //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
 	++it;                               // goto next list element
     }
  
 #else /* USEQPE */
     int cnt = 0;
     DIR *d;
@@ -4165,13 +4166,13 @@ void QTReaderApp::OnURLSelected(const QString& href)
 	m_url_localfile = urld->localfile();
 	m_url_globalfile = urld->globalfile();
 	if (m_url_clipboard)
 	{
 	    QClipboard* cb = QApplication::clipboard();
 	    cb->setText(href);
-	    qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
+        odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl;
 	}
 	if (m_url_localfile)
 	{
 	    writeUrl(reader->m_string, href);
 	}
 	if (m_url_globalfile)
@@ -4189,20 +4190,20 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
     filename = Global::applicationFileName(APPDIR "/urls", file);
 #else
     QFileInfo fi;
     QDir d = QDir::home();                      // "/"
     if ( !d.cd(APPDIR) )
     {                       // "/tmp"
-	qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+    owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
 	d = QDir::home();
 	d.mkdir(APPDIR);
 	d.cd(APPDIR);
     }
     if ( !d.cd("urls") )
     {                       // "/tmp"
-	qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+    owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl;
 	d = QDir::home();
 	d.cd(APPDIR);
 	d.mkdir("urls");
 	d.cd("urls");
     }
     fi.setFile(d, file);
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 9fb56b7..f47acee 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -3,13 +3,13 @@
 #include "StyleConsts.h"
 
 GraphicLink::~GraphicLink() { delete graphic; }
 
 pmstore::~pmstore()
 { 
-////    qDebug("Deleting image");
+////    odebug << "Deleting image" << oendl; 
     delete graphic;
 }
 
 CStyle::~CStyle()
 {
     if (graphic != NULL)
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index e1cde6c..72a1222 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -129,13 +129,13 @@ fileBrowser::~fileBrowser()
 }
 
 
 void fileBrowser::populateList()
 {
     ListView->clear();
-////qDebug(currentDir.canonicalPath());
+////odebug << currentDir.canonicalPath() << oendl; 
 //    currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
     currentDir.setFilter( filterspec );
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
@@ -153,34 +153,34 @@ void fileBrowser::populateList()
 	    if( fi->isDir() )
 	    {
 		fileL+="/";
 	    } 
 	    else 
 	    {
-////        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+////        odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; 
 	    }
 	    new QListViewItem( ListView,fileL,fileS );
 	}
 	++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
     ListView->setFocus();
 }
 
 void fileBrowser::upDir()
 {
-////    qDebug(currentDir.canonicalPath());
+////    odebug << currentDir.canonicalPath() << oendl; 
 }
 
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     if (selectedItem == NULL) return;
     QString strItem=selectedItem->text(0);
 
-////    qDebug("%s", (const char*)strItem);
+////    odebug << "" << strItem << "" << oendl; 
     
 
     QString strSize=selectedItem->text(1);
 
     strSize.stripWhiteSpace();
 
diff --git a/noncore/apps/opie-reader/opie-reader.pro b/noncore/apps/opie-reader/opie-reader.pro
index e42204a..dbf6964 100644
--- a/noncore/apps/opie-reader/opie-reader.pro
+++ b/noncore/apps/opie-reader/opie-reader.pro
@@ -82,11 +82,11 @@ SOURCES		= Aportis.cpp \
 
 DESTDIR = $(OPIEDIR)/bin
 TARGET = reader
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS		+= -lqpe
+LIBS        += -lqpe -lopiecore2
 
 include ( $(OPIEDIR)/include.pro )
 
 
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp
index e52fd6a..a8e688f 100644
--- a/noncore/apps/opie-reader/plucker.cpp
+++ b/noncore/apps/opie-reader/plucker.cpp
@@ -54,47 +54,47 @@ int CPlucker::bgetch()
 {
     int ch = EOF;
     if (bufferpos >= buffercontent)
     {
 	if (!m_continuous) return EOF;
 	if (bufferrec >= ntohs(head.recordList.numRecords) - 1) return EOF;
-////	qDebug("Passing through %u", currentpos);
+////	odebug << "Passing through " << currentpos << "" << oendl; 
 	if (!expand(bufferrec+1)) return EOF;
 	mystyle.unset();
 	if (m_ParaOffsets[m_nextParaIndex] == 0)
 	{
 	    while (m_ParaOffsets[m_nextParaIndex+1] == 0)
 	    {
-//		qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+//		odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl; 
 		m_nextParaIndex++;
 	    }
 	}
 	mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-//	qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+//	odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl; 
 	ch = 10;
 	EOPPhase = 4;
     }
     else if (bufferpos == m_nextPara)
     {
 	while (bufferpos == m_nextPara)
 	{
 	    UInt16 attr = m_ParaAttrs[m_nextParaIndex];
 	    m_nextParaIndex++;
-//	    qDebug("Skipping extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+//	    odebug << "Skipping extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl; 
 	    if (m_nextParaIndex == m_nParas)
 	    {
 		m_nextPara = -1;
 	    }
 	    else
 	    {
 		m_nextPara += m_ParaOffsets[m_nextParaIndex];
 	    }
 	}
 	mystyle.unset();
 	mystyle.setExtraSpace((m_ParaAttrs[m_nextParaIndex]&7)*2);
-//	qDebug("Using extraspace:%d", m_ParaAttrs[m_nextParaIndex]&7);
+//	odebug << "Using extraspace:" << m_ParaAttrs[m_nextParaIndex]&7 << "" << oendl; 
 	if (m_lastBreak == locate())
 	{
 	    currentpos++;
 	    ch = expandedtextbuffer[bufferpos++];
 	}
 	else
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp
index caa945d..b523a54 100644
--- a/noncore/apps/opie-reader/plucker_base.cpp
+++ b/noncore/apps/opie-reader/plucker_base.cpp
@@ -1,27 +1,35 @@
+
+
 #include "useqpe.h"
-#include <stdio.h>
-#include <string.h>
+#include "plucker_base.h"
+#include "Aportis.h"
+#include "Palm2QImage.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
-#endif /* USEQPE */
-#ifdef LOCALPICTURES
-#include <qscrollview.h>
-#endif
-#ifdef USEQPE
 #include <qpe/global.h>
 #endif /* USEQPE */
+
 #ifndef USEQPE
 #include <qapplication.h>
 #else /* USEQPE */
 #include <qpe/qpeapplication.h>
 #endif /* USEQPE */
 
-#include "plucker_base.h"
-#include "Aportis.h"
-#include "Palm2QImage.h"
+/* QT */
+#ifdef LOCALPICTURES
+#include <qscrollview.h>
+#endif
+
+/* STD */
+#include <stdio.h>
+#include <string.h>
+
 
 CPlucker_base::CPlucker_base() :
 #ifdef LOCALPICTURES
     m_viewer(NULL),
     m_picture(NULL),
 #endif
@@ -90,30 +98,30 @@ void CPlucker_base::sizes(unsigned long& _file, unsigned long& _text)
 char* CPlucker_base::geturl(UInt16 tgt)
 {
     char * pRet = NULL;
     gotorecordnumber(0);
     fread(&hdr0, 1, 6, fin);
     unsigned int nrecs = ntohs(hdr0.nRecords);
-    //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+    //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
     UInt16 urlid = 0;
     bool urlsfound = false;
     char* urls = NULL;
     size_t urlsize = 0;
     for (unsigned int i = 0; i < nrecs; i++)
     {
 	UInt16 id, name;
 	fread(&name, 1, sizeof(name), fin);
 	fread(&id, 1, sizeof(id), fin);
-	//qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+    //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
 	if (ntohs(name) == 2)
 	{
 	    urlsfound = true;
 	    urlid = id;
-	    //qDebug("Found url index:%d", ntohs(urlid));
+        //odebug << "Found url index:" << ntohs(urlid) << "" << oendl;
 	}
-//	//qDebug("%x", id);
+//  //odebug << "" << id << "" << oendl;
     }
     if (urlsfound)
     {
 	unsigned short recptr = finduid(ntohs(urlid));
 	if (recptr != 0)
 	{
@@ -126,37 +134,37 @@ char* CPlucker_base::geturl(UInt16 tgt)
 	    while (1)
 	    {
 		UInt16 tctr;
 		fread(&tctr, 1, sizeof(tctr), fin);
 		fread(&urlid, 1, sizeof(urlid), fin);
 		tctr = ntohs(tctr);
-		//qDebug("tgt:%u urlctr:%u tctr:%u", tgt, urlctr, tctr);
+        //odebug << "tgt:" << tgt << " urlctr:" << urlctr << " tctr:" << tctr << "" << oendl;
 		if (tctr >= tgt)
 		{
 		    break;
 		}
 		urlctr = tctr;
 	    }
-	    //qDebug("urls are in %d", ntohs(urlid));
+        //odebug << "urls are in " << ntohs(urlid) << "" << oendl;
 	    recptr = finduid(ntohs(urlid));
 	    if (recptr != 0)
 	    {
 		UInt32 reclen = recordlength(recptr) - HeaderSize();
 		gotorecordnumber(recptr);
 		GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-		//qDebug("Found urls:%x",thishdr_type);
+        //odebug << "Found urls:" << thishdr_type << "" << oendl;
 		urlsize = thishdr_size;
 		urls = new char[urlsize];
 		Expand(reclen, thishdr_type, (UInt8*)urls, urlsize);
 		char* ptr = urls;
 		int rn = urlctr+1;
 		while (ptr - urls < urlsize)
 		{
 		    if (rn == tgt)
 			{
-			    //qDebug("URL:%s", ptr);
+                //odebug << "URL:" << ptr << "" << oendl;
 			    int len = strlen(ptr)+1;
 			    pRet = new char[len];
 			    memcpy(pRet, ptr, len);
 			    break;
 			}
 		    ptr += strlen(ptr)+1;
@@ -247,13 +255,13 @@ void CPlucker_base::locate(unsigned int n)
 	UInt32 thishdr_size;
 	UInt8 thishdr_type, thishdr_reserved;
 	while (n < textlength && recptr > 1)
 	{
 	    recptr--;
 	    gotorecordnumber(recptr);
-	    //qDebug("recptr:%u", recptr);
+        //odebug << "recptr:" << recptr << "" << oendl;
 	    GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
 	    if (thishdr_type < 2)
 	    {
 		textlength -= thishdr_size;
 	    }
 	}
@@ -272,13 +280,13 @@ void CPlucker_base::locate(unsigned int n)
 	    if (!(thishdr_type < 2))
 	    {
 		thishdr_size = 0;
 	    }
 	}
     }
-//    qDebug("Time(1): %u", clock()-start);
+//    odebug << "Time(1): " << clock()-start << "" << oendl;
 /*
     expand(recptr);
     mystyle.unset();
     bufferpos = n-textlength;
     currentpos = n;
     while (bufferpos >= m_nextPara && m_nextPara >= 0)
@@ -318,24 +326,24 @@ void CPlucker_base::locate(unsigned int n)
 	else
 	{
 	    bs = 0;
 	}
     } while (locpos + bs <= n);
 
-//    qDebug("Time(2): %u", clock()-start);
+//    odebug << "Time(2): " << clock()-start << "" << oendl;
     if (recptr != thisrec)
     {
-	qDebug("Disaster:recptr:%u thisrec:%u", recptr, thisrec);
+    odebug << "Disaster:recptr:" << recptr << " thisrec:" << thisrec << "" << oendl;
 	UInt16 thishdr_uid, thishdr_nParagraphs;
 	UInt32 thishdr_size = buffercontent;
 	UInt8 thishdr_type, thishdr_reserved;
 	for (recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
 	{
 	    gotorecordnumber(recptr);
 	    GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-//	    qDebug("UID:%u Paras:%u Size:%u Type:%u Reserved:%u", thishdr_uid, thishdr_nParagraphs, thishdr_size, (unsigned int)thishdr_type, (unsigned int)thishdr_reserved);
+//      odebug << "UID:" << thishdr_uid << " Paras:" << thishdr_nParagraphs << " Size:" << thishdr_size << " Type:" << (unsigned int)thishdr_type << " Reserved:" << (unsigned int)thishdr_reserved << "" << oendl;
 	}
 //	QApplication::exit ( 100 );
     }
 
     currentpos = locpos;
     expand(thisrec);
@@ -368,38 +376,38 @@ bool CPlucker_base::expand(int thisrec)
     UInt16 thishdr_uid, thishdr_nParagraphs;
     UInt32 thishdr_size;
     UInt8 thishdr_type, thishdr_reserved;
     while (1)
     {
 	GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
-	//qDebug("This (%d) type is %d, uid is %u", thisrec, thishdr_type, thishdr_uid);
+    //odebug << "This (" << thisrec << ") type is " << thishdr_type << ", uid is " << thishdr_uid << "" << oendl;
 	if (thishdr_type < 2) break;
-	//qDebug("Skipping paragraph of type %d", thishdr_type);
+    //odebug << "Skipping paragraph of type " << thishdr_type << "" << oendl;
 	if (++thisrec >= ntohs(head.recordList.numRecords) - 1) return false;
 	reclen = recordlength(thisrec);
 	gotorecordnumber(thisrec);
     }
     m_nParas = thishdr_nParagraphs;
     m_bufferisreserved = (thishdr_reserved != 0);
-    //qDebug("It has %u paragraphs and is %u bytes", thishdr_nParagraphs, thishdr_size);
+    //odebug << "It has " << thishdr_nParagraphs << " paragraphs and is " << thishdr_size << " bytes" << oendl;
     uid = thishdr_uid;
 //    gotorecordnumber(thisrec);
 //    fread(expandedtextbuffer,1,10,fin);
     for (int i = 0; i < m_nParas; i++)
     {
 	UInt16 ubytes, attrs;
 	fread(&ubytes, 1, sizeof(ubytes), fin);
 	fread(&attrs, 1, sizeof(attrs), fin);
 	m_ParaOffsets[i] = ntohs(ubytes);
 	m_ParaAttrs[i] = ntohs(attrs);
-//	//qDebug("Bytes %u, Attr %x", ntohs(ubytes), ntohs(attrs));
+//  //odebug << "Bytes " << ntohs(ubytes) << ", Attr " << ntohs(attrs) << "" << oendl;
     }
     if (m_nParas > 0)
     {
 	m_nextPara = m_ParaOffsets[0];
-	//qDebug("First offset = %u", m_nextPara);
+    //odebug << "First offset = " << m_nextPara << "" << oendl;
 	m_nextParaIndex = 0;
     }
     else
     {
 	m_nextPara = -1;
     }
@@ -415,13 +423,13 @@ bool CPlucker_base::expand(int thisrec)
 	expandedtextbuffer = new UInt8[buffersize];
     }
 
     Expand(reclen, thishdr_type, expandedtextbuffer, buffercontent);
     bufferpos = 0;
     bufferrec = thisrec;
-    //qDebug("BC:%u, HS:%u", buffercontent, thishdr_size);
+    //odebug << "BC:" << buffercontent << ", HS:" << thishdr_size << "" << oendl;
     return true;
 }
 
 void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize)
 {
     z_stream zstream;
@@ -449,13 +457,13 @@ void CPlucker_base::UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuff
         }
         zstream.next_out  = tgtbuffer;
         zstream.avail_out = bsize;
 
         err = inflate( &zstream, Z_SYNC_FLUSH );
 
-//	//qDebug("err:%d - %u", err, zstream.avail_in);
+//  //odebug << "err:" << err << " - " << zstream.avail_in << "" << oendl;
 
     } while ( err == Z_OK );
 
     inflateEnd(&zstream);
 }
 
@@ -531,15 +539,15 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
 	GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
 	if (thishdr_type == 8)
 	{
 	    UInt16 n;
 	    fread(&n, 1, sizeof(n), fin);
 	    n = ntohs(n);
-	    //qDebug("Found %u bookmarks", n);
+        //odebug << "Found " << n << " bookmarks" << oendl;
 	}
-	//qDebug("Found:%d, %u", i , thishdr_type);
+    //odebug << "Found:" << i << ", " << thishdr_type << "" << oendl;
     }
 */
     return NULL;
 }
 
 
@@ -589,31 +597,31 @@ QImage* CPlucker_base::getPicture(unsigned long tgt)
 
 #ifdef LOCALPICTURES
 #include <unistd.h>
 #include <qpe/global.h>
 void CPlucker_base::showimg(UInt16 tgt)
 {
-    //qDebug("Crassssssh!");
+    //odebug << "Crassssssh!" << oendl;
     QPixmap* qimage = expandimg(tgt);
     m_picture->setFixedSize(qimage->size());
     m_picture->setBackgroundPixmap(*qimage);
     delete qimage;
     m_viewer->show();
 
 /*
     char tmp[] = "uqtreader.XXXXXX";
     QImage* qimage = getimg(tgt);
     QPixmap* image = new QPixmap(0,0);
-//    //qDebug("New image");
+//    //odebug << "New image" << oendl;
     image->convertFromImage(*qimage);
     delete qimage;
     char tmpfile[sizeof(tmp)+1];
     strcpy(tmpfile,tmp);
     int f = mkstemp(tmpfile);
     close(f);
-    //qDebug("TMPFILE:%s", tmpfile);
+    //odebug << "TMPFILE:" << tmpfile << "" << oendl;
     if (image->save(tmpfile,"PNG"))
     {
 	QCopEnvelope e("QPE/Application/showimg", "setDocument(QString)");
 	e << QString(tmpfile);
     }
     Global::statusMessage("Opening image");
@@ -624,24 +632,24 @@ void CPlucker_base::showimg(UInt16 tgt)
 }
 
 #endif
 
 unsigned short CPlucker_base::finduid(unsigned short urlid)
 {
-//    //qDebug("Finding %u", urlid);
+//    //odebug << "Finding " << urlid << "" << oendl;
     unsigned short jmin = 1, jmax = ntohs(head.recordList.numRecords);
     unsigned short jmid = (jmin+jmax) >> 1;
     while (jmax - jmin > 1)
     {
 	gotorecordnumber(jmid);
 	UInt16 thishdr_uid, thishdr_nParagraphs;
 	UInt32 thishdr_size;
 	UInt8 thishdr_type, thishdr_reserved;
 	GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
 	unsigned short luid = thishdr_uid;
-//	//qDebug("%u %u %u : %u", jmin, jmid, jmax, urlid);
+//  //odebug << "" << jmin << " " << jmid << " " << jmax << " : " << urlid << "" << oendl;
 	if (luid == urlid)
 	{
 	    return jmid;
 	}
 	if (luid < urlid)
 	{
@@ -656,26 +664,26 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
     gotorecordnumber(jmin);
     UInt16 thishdr_uid, thishdr_nParagraphs;
     UInt32 thishdr_size;
     UInt8 thishdr_type, thishdr_reserved;
     GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
     unsigned short luid = thishdr_uid;
-    //qDebug("jmin at end:%u,%u", jmin, luid);
+    //odebug << "jmin at end:" << jmin << "," << luid << "" << oendl;
     if (luid == urlid)
     {
 	return jmin;
     }
     gotorecordnumber(jmax);
     GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
     luid = thishdr_uid;
-    //qDebug("jmax at end:%u,%u", jmax, luid);
+    //odebug << "jmax at end:" << jmax << "," << luid << "" << oendl;
     if (luid == urlid)
     {
 	return jmax;
     }
-    //qDebug("Couldn't find %u", urlid);
+    //odebug << "Couldn't find " << urlid << "" << oendl;
     return 0; // Not found!
 }
 
 
 void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
 {
@@ -695,13 +703,13 @@ void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsig
     for (it = visited.begin(); it != visited.end(); it++)
 #else
     for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
 #endif
     {
 	unsigned long t = *it;
-//	qDebug("[%u]", t);
+//  odebug << "[" << t << "]" << oendl;
 	memcpy(newdata, &t, sizeof(t));
 	newdata += sizeof(t);
     }
     m_nav.setSaveData(data, len, pdata, newlen);
     delete [] pdata;
 }
@@ -718,13 +726,13 @@ void CPlucker_base::putSaveData(unsigned char*& src, unsigned short& srclen)
     for (int i = 0; i < sz; i++)
     {
 	unsigned long t;
 	if (srclen >= sizeof(t))
 	{
 	    memcpy(&t, src, sizeof(t));
-//	    qDebug("[%u]", t);
+//      odebug << "[" << t << "]" << oendl;
 	    visited.push_front(t);
 	    src += sizeof(t);
 	    srclen -= sizeof(t);
 	}
 	else
 	{
@@ -748,23 +756,23 @@ int CPlucker_base::OpenFile(const char *src)
     gotorecordnumber(0);
     fread(&hdr0, 1, 6, fin);
     setbuffersize();
     compressedtextbuffer = new UInt8[compressedbuffersize];
     expandedtextbuffer = new UInt8[buffersize];
 
-    //qDebug("Total number of records:%u", ntohs(head.recordList.numRecords));
+    //odebug << "Total number of records:" << ntohs(head.recordList.numRecords) << "" << oendl;
     
     unsigned int nrecs = ntohs(hdr0.nRecords);
-    //qDebug("Version %u, no. recs %u", ntohs(hdr0.version), nrecs);
+    //odebug << "Version " << ntohs(hdr0.version) << ", no. recs " << nrecs << "" << oendl;
     UInt16 homerecid = 1;
     for (unsigned int i = 0; i < nrecs; i++)
     {
 	UInt16 id, name;
 	fread(&name, 1, sizeof(name), fin);
 	fread(&id, 1, sizeof(id), fin);
-	//qDebug("N:%d, I:%d", ntohs(name), ntohs(id));
+    //odebug << "N:" << ntohs(name) << ", I:" << ntohs(id) << "" << oendl;
 	if (ntohs(name) == 0) homerecid = ntohs(id);
     }
 
     textlength = 0;
     for (int recptr = 1; recptr < ntohs(head.recordList.numRecords); recptr++)
     {
@@ -816,25 +824,25 @@ QImage* CPlucker_base::getimg(UInt16 tgt)
 
 linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
 {
     visited.push_front(n);
     UInt16 tuid = (n >> 16);
     n &= 0xffff;
-//    //qDebug("Hyper:<%u,%u>", tuid, n);
+//    //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
     UInt16 thisrec = 1;
     currentpos = 0;
     gotorecordnumber(thisrec);
     UInt16 thishdr_uid, thishdr_nParagraphs;
     UInt32 thishdr_size;
     UInt8 thishdr_type, thishdr_reserved;
     while (1)
     {
 	GetHeader(thishdr_uid, thishdr_nParagraphs, thishdr_size, thishdr_type, thishdr_reserved);
 	if (tuid == thishdr_uid) break;
 	if (thishdr_type < 2) currentpos += thishdr_size;
-//	//qDebug("hyper-cp:%u", currentpos);
+//  //odebug << "hyper-cp:" << currentpos << "" << oendl;
 	thisrec++;
 	if (thisrec >= ntohs(head.recordList.numRecords))
 	{
 	    char *turl = geturl(tuid);
 	    if (turl == NULL)
 	    {
@@ -854,13 +862,13 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
 		else
 		{
 		    Global::statusMessage(wrd);
 		}
 #else
 #endif /* USEQPE */
-		//qDebug("Link:%s", (const char*)wrd);
+        //odebug << "Link:" << wrd << "" << oendl;
 //		setlink(fn, wrd);
 		delete [] turl;
 	    }
 	    return eNone;
 	}
 	gotorecordnumber(thisrec);
@@ -923,13 +931,13 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
 	    QMessageBox::information(NULL,
 				 QString(PROGNAME),
 				 QString("Error in link\nOffset too big")
 		);
 	    return eNone;
 	}
-	//qDebug("Hyper:<%u,%u>", tuid, n);
+    //odebug << "Hyper:<" << tuid << "," << n << ">" << oendl;
 	while (bufferpos < n && bufferpos < buffercontent) getch_base(true);
 /*      // This is faster but the alignment doesn't get set
 	mystyle.unset();
 	bufferpos = n;
 	currentpos += n;
 	while (bufferpos >= m_nextPara && m_nextPara >= 0)
@@ -953,17 +961,17 @@ linkType CPlucker_base::hyperlink(unsigned int n, QString& wrd)
 tchar CPlucker_base::getch_base(bool fast)
 {
     int ch = bgetch();
     while (ch == 0)
     {
 	ch = bgetch();
-//	//qDebug("Function:%x", ch);
+//  //odebug << "Function:" << ch << "" << oendl;
 	switch (ch)
 	{
 	    case 0x38:
-//		//qDebug("Break:%u", locate());
+//      //odebug << "Break:" << locate() << "" << oendl;
 		if (m_lastBreak == locate())
 		{
 		    ch = bgetch();
 		}
 		else
 		{
@@ -977,28 +985,28 @@ tchar CPlucker_base::getch_base(bool fast)
 		unsigned long ln = 0;
 		int skip = ch & 7;
 		for (int i = 0; i < 2; i++)
 		{
 		    int ch = bgetch();
 		    ln = (ln << 8) + ch;
-//		    //qDebug("ch:%d, ln:%u", ch, ln);
+//          //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
 		}
 		if (skip == 2)
 		{
 		    ln <<= 16;
 		}
 		else
 		{
 		    for (int i = 0; i < 2; i++)
 		    {
 			int ch = bgetch();
 			ln = (ln << 8) + ch;
-//			//qDebug("ch:%d, ln:%u", ch, ln);
+//          //odebug << "ch:" << ch << ", ln:" << ln << "" << oendl;
 		    }
 		}
-//		//qDebug("ln:%u", ln);
+//      //odebug << "ln:" << ln << "" << oendl;
 		mystyle.setLink(true);
 		mystyle.setData(ln);
 //		mystyle.setColour(255, 0, 0);
 		bool hasseen = false;
 		for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++)
 		{
@@ -1035,13 +1043,13 @@ tchar CPlucker_base::getch_base(bool fast)
 		mystyle.unsetItalic();
 		ch = bgetch();
 		break;
 	    case 0x11:
 	    {
 		ch = bgetch();
-//		//qDebug("Font:%d",ch);
+//      //odebug << "Font:" << ch << "" << oendl;
 		mystyle.setVOffset(0);
 		mystyle.unsetMono();
 		mystyle.unsetBold();
 		mystyle.setFontSize(0);
 		switch (ch)
 		{
@@ -1069,13 +1077,13 @@ tchar CPlucker_base::getch_base(bool fast)
 			mystyle.setBold();
 			break;
 		    case 7:
 			mystyle.setBold();
 			break;
 		    case 8: // should be fixed width
-			//qDebug("Trying fixed width");
+            //odebug << "Trying fixed width" << oendl;
 			mystyle.setMono();
 			break;
 		    case 9:
 			mystyle.setFontSize(-1);
 			break;
 		    case 10:
@@ -1084,37 +1092,37 @@ tchar CPlucker_base::getch_base(bool fast)
 			break;
 		    case 11:
 			mystyle.setFontSize(-2);
 			mystyle.setVOffset(-1);
 			break;
 		    default:
-			qDebug("Unrecognised font");
+            odebug << "Unrecognised font" << oendl;
 			break;
 		}
 		ch = bgetch();
 	    }
 	    break;
 	    case 0x29:
 		ch = bgetch();
 		switch (ch)
 		{
 		    case 0:
 			mystyle.setLeftJustify();
-//			//qDebug("left");
+//          //odebug << "left" << oendl;
 			break;
 		    case 1:
 			mystyle.setRightJustify();
-//			//qDebug("right");
+//          //odebug << "right" << oendl;
 			break;
 		    case 2:
 			mystyle.setCentreJustify();
-//			//qDebug("centre");
+//          //odebug << "centre" << oendl;
 			break;
 		    case 3:
 			mystyle.setFullJustify();
-//			//qDebug("full");
+//          //odebug << "full" << oendl;
 			break;
 
 		}
 		ch = bgetch();
 		break;
 	    case 0x53:
@@ -1131,13 +1139,13 @@ tchar CPlucker_base::getch_base(bool fast)
 	    {
 		bool hasalternate = (ch == 0x5c);
 		UInt16 ir = bgetch();
 		ir = (ir << 8) + bgetch();
 		if (hasalternate)
 		{
-		    //qDebug("Alternate image:%x", ir);
+            //odebug << "Alternate image:" << ir << "" << oendl;
 		    UInt16 ir2 = bgetch();
 		    ir2 = (ir2 << 8) + bgetch();
 		    if (!fast) mystyle.setPicture(true, expandimg(ir2, true), true, ir << 16);
 #ifdef LOCALPICTURES
 		    UInt32 ln = ir;
 		    ln <<= 16;
@@ -1146,31 +1154,31 @@ tchar CPlucker_base::getch_base(bool fast)
 #endif
 		}
 		else
 		{
 		    if (!fast) mystyle.setPicture(true, expandimg(ir));
 		}
-//		if (mystyle.getLink()) qDebug("Picture link!");
+//      if (mystyle.getLink()) odebug << "Picture link!" << oendl;
 		ch = '#';
 	    }
 //	    ch = bgetch();
 	    break;
 	    case 0x33:
 	    {
 		UInt8 h = bgetch();
 		UInt8 wc = bgetch();
 		UInt8 pc = bgetch();
 		UInt16 w = wc;
-//		//qDebug("h,w,pc [%u, %u, %u]", h, w, pc);
+//      //odebug << "h,w,pc [" << h << ", " << w << ", " << pc << "]" << oendl;
 		if (w == 0)
 		{
 		    w = (m_scrWidth*(unsigned long)pc)/100;
 		}
 		if (w == 0) w = m_scrWidth;
 		mystyle.setPicture(false, hRule(w,h,mystyle.Red(),mystyle.Green(),mystyle.Blue()));
-//		if (mystyle.getLink()) //qDebug("hRule link!");
+//      if (mystyle.getLink()) //odebug << "hRule link!" << oendl;
 		ch = '#';
 	    }
 	    break;
 	    case 0x60:
 		mystyle.setUnderline();
 		ch = bgetch();
@@ -1179,16 +1187,16 @@ tchar CPlucker_base::getch_base(bool fast)
 		mystyle.unsetUnderline();
 		ch = bgetch();
 		break;
 	    case 0x22:
 		ch = bgetch();
 		mystyle.setLeftMargin(ch);
-//		//qDebug("Left margin:%d", ch);
+//      //odebug << "Left margin:" << ch << "" << oendl;
 		ch = bgetch();
 		mystyle.setRightMargin(ch);
-//		//qDebug("Right margin:%d", ch);
+//      //odebug << "Right margin:" << ch << "" << oendl;
 		ch = bgetch();
 		break;
 	    case 0x70:
 		mystyle.setStrikethru();
 		ch = bgetch();
 		break;
@@ -1200,24 +1208,24 @@ tchar CPlucker_base::getch_base(bool fast)
 	    {
 		int tlen = bgetch();
 		ch = bgetch();
 		ch <<= 8;
 		ch |= (tchar)bgetch();
 		for (int i = 0; i < tlen; i++) bgetch();
-		//qDebug("Function 83");
+        //odebug << "Function 83" << oendl;
 	    }
 	    break;
 	    case 0x85:
 	    default:
-		qDebug("Function:%x NOT IMPLEMENTED", ch);
+        odebug << "Function:" << ch << " NOT IMPLEMENTED" << oendl;
 		{
 		    int skip = ch & 7;
 		    for (int i = 0; i < skip; i++)
 		    {
 			ch = bgetch();
-			//qDebug("Arg %d, %d", i, ch);
+            //odebug << "Arg " << i << ", " << ch << "" << oendl;
 		    }
 		    ch = bgetch();
 		}
 	}
     }
 
diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 22a4917..4c15fd0 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -19,30 +19,31 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 
 #include "katebuffer.h"
+#include "kdebug.h"
 
-// Includes for reading file
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qfile.h>
 #include <qtextstream.h>
-
 #include <qtimer.h>
 #include <qtextcodec.h>
 
-//
-
+/* STD */
+// Includes for reading file
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
 #include <assert.h>
-#include <kdebug.h>
 
 /**
  * Create an empty buffer.
  */
 KWBuffer::KWBuffer()
 {
@@ -63,13 +64,13 @@ KWBuffer::clear()
  * Insert a file at line @p line in the buffer.
  */
 void
 KWBuffer::insertFile(int line, const QString &file, QTextCodec *codec)
 {
 	if (line) {
-		qDebug("insert File only supports insertion at line 0 == file opening");
+        odebug << "insert File only supports insertion at line 0 == file opening" << oendl;
 		return;
 	}
 	clear();
 	QFile iofile(file);
 	iofile.open(IO_ReadOnly);
 	QTextStream stream(&iofile);
@@ -118,13 +119,13 @@ KWBuffer::slotLoadFile()
 /**
  * Return the total number of lines in the buffer.
  */
 int
 KWBuffer::count()
 {
-  qDebug("m_stringList.count %d",m_stringList.count());
+  odebug << "m_stringList.count " << m_stringList.count() << "" << oendl;
   return m_lineCount;
 //	return m_stringList.count();
 //   return m_totalLines;
 }
 
 
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 0c742d7..6dc4fd2 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -36,50 +36,51 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "katedocument.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
 
+//#include "kcharsets.h"
+#include "kdebug.h"
+//#include "kinstance.h"
 
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include "kglobalsettings.h"
+//#include "kaction.h"
+//#include "kstdaction.h"
 
-#include <kmessagebox.h>
-#include <qpe/config.h>
-#include <qstring.h>
+#include "../view/kateview.h"
+#include "katebuffer.h"
+#include "katetextline.h"
 
-#include <sys/time.h>
-#include <unistd.h>
+#include "katecmd.h"
 
-#include <stdio.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
 
+/* QT */
+#include <qfileinfo.h>
+#include <qdatetime.h>
+#include <qstring.h>
 #include <qtimer.h>
 #include <qobject.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qfont.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
-#include <kglobal.h>
-
-//#include <kcharsets.h>
-#include <kdebug.h>
-//#include <kinstance.h>
-
-#include <kglobalsettings.h>
-//#include <kaction.h>
-//#include <kstdaction.h>
-
-#include "../view/kateview.h"
-#include "katebuffer.h"
-#include "katetextline.h"
 
-#include "katecmd.h"
+/* STD */
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdio.h>
 
 KateAction::KateAction(Action a, PointStruc &cursor, int len, const QString &text)
   : action(a), cursor(cursor), len(len), text(text) {
 }
 
 KateActionGroup::KateActionGroup(PointStruc &aStart, int type)
@@ -295,20 +296,20 @@ void KateDocument::openURL(const QString &filename)
   m_file=filename;  
   fileInfo->setFile (m_file);
   setMTime();
 
   if (!fileInfo->exists() || !fileInfo->isReadable())
   {
-    qDebug("File doesn't exit or couldn't be read");
+    odebug << "File doesn't exit or couldn't be read" << oendl;
     return ;
   }
 
   buffer->clear();
 #warning fixme
 //  buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding));
-  qDebug("Telling buffer to open file");
+  odebug << "Telling buffer to open file" << oendl;
   buffer->insertFile(0, m_file, QTextCodec::codecForLocale());
 
   setMTime();
 
   if (myWordWrap)
     wrapText (myWordWrapAt);
@@ -680,13 +681,13 @@ void KateDocument::setHighlight(int n) {
   PreHighlightedTill=0;
   RequestPreHighlightTill=0;
   emit(highlightChanged());
 }
 
 void KateDocument::makeAttribs() {
-  qDebug("KateDocument::makeAttribs()");
+  odebug << "KateDocument::makeAttribs()" << oendl;
   m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs);
   updateFontData();
   updateLines();
 }
 
 void KateDocument::updateFontData() {
@@ -1920,13 +1921,13 @@ void KateDocument::updateLines(int startLine, int endLine, int flags, int cursor
     if (textLine==0) kdDebug(13020)<<"****updateLines()>> error textLine==0"<<endl;
     if (line <= endLine && line != cursorY) {
       if (flags & KateView::cfRemoveSpaces) textLine->removeSpaces();
       updateMaxLength(textLine);
     }
     endCtx = textLine->getContext();
-//    qDebug("DOHIGHLIGHT");
+//    odebug << "DOHIGHLIGHT" << oendl;
     
     ctxNum = m_highlight->doHighlight(ctxNum,textLine);
     textLine->setContext(ctxNum);
     line++;
   } while ((buffer->line(line)!=0) && (line <= endLine || endCtx != ctxNum));
 //  kdDebug(13020)<<"updateLines :: while loop left"<<endl;
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 0d2c283..539d356 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -16,32 +16,36 @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <string.h>
-
-#include <qtextstream.h>
-#include <qpe/config.h>
-#include <kglobal.h>
-//#include <kinstance.h>
-//#include <kmimemagic.h>
-#include <klocale.h>
-//#include <kregexp.h>
-#include <kglobalsettings.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-
 #include "katehighlight.h"
-
-
 #include "katetextline.h"
 #include "katedocument.h"
 #include "katesyntaxdocument.h"
 
+#include "kglobal.h"
+//#include "kinstance.h"
+//#include "kmimemagic.h"
+#include "klocale.h"
+//#include "kregexp.h"
+#include "kglobalsettings.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qtextstream.h>
+
+/* STD */
+#include <string.h>
+
 
 HlManager *HlManager::s_pSelf = 0;
 
 enum Item_styles { dsNormal,dsKeyword,dsDataType,dsDecVal,dsBaseN,dsFloat,dsChar,dsString,dsComment,dsOthers};
 
 static bool trueBool = true;
@@ -618,13 +622,13 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
     {
       if (item->startEnable(lastChar))
       {
         s2 = item->checkHgl(s1, len-z, z==0);
         if (s2 > s1)
         {
-	    qDebug("An item has been detected");
+        odebug << "An item has been detected" << oendl;
             textLine->setAttribs(item->attr,s1 - str,s2 - str);
             ctxNum = item->ctx;
             context = contextList[ctxNum];
             z = z + s2 - s1 - 1;
             s1 = s2 - 1;
             found = true;
@@ -850,13 +854,13 @@ void Highlight::done()
                         *************
                         * return value: none
 *******************************************************************************************/
 
 void Highlight::createItemData(ItemDataList &list)
 {
-    qDebug("Highlight::createItemData");
+    odebug << "Highlight::createItemData" << oendl;
 
   // If no highlighting is selected we need only one default.
   if (noHl)
   {
      list.append(new ItemData(I18N_NOOP("Normal Text"), dsNormal));
      return;
@@ -871,21 +875,21 @@ void Highlight::createItemData(ItemDataList &list)
   if (internalIDList.count()==0)
   {
     //if all references to the list are destried the contents will also be deleted
     internalIDList.setAutoDelete(true);
     syntaxContextData *data;
 
-    qDebug("Trying to read itemData section");
+    odebug << "Trying to read itemData section" << oendl;
 
     //Tell the syntax document class which file we want to parse and which data group
     HlManager::self()->syntax->setIdentifier(identifier);
     data=HlManager::self()->syntax->getGroupInfo("highlighting","itemData");
     //begin with the real parsing
     while (HlManager::self()->syntax->nextGroup(data))
       {
-	qDebug("Setting up one itemData element");
+    odebug << "Setting up one itemData element" << oendl;
         // read all attributes
         color=HlManager::self()->syntax->groupData(data,QString("color"));
         selColor=HlManager::self()->syntax->groupData(data,QString("selColor"));
         bold=HlManager::self()->syntax->groupData(data,QString("bold"));
         italic=HlManager::self()->syntax->groupData(data,QString("italic"));
         //check if the user overrides something
@@ -1309,22 +1313,22 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
   ItemStyleList defaultStyleList;
   ItemStyle *defaultStyle;
   ItemDataList itemDataList;
   ItemData *itemData;
   int nAttribs, z;
 
-  qDebug("HlManager::makeAttribs");
+  odebug << "HlManager::makeAttribs" << oendl;
 
   defaultStyleList.setAutoDelete(true);
   getDefaults(defaultStyleList);
 
 //  itemDataList.setAutoDelete(true);
   highlight->getItemDataList(itemDataList);
   nAttribs = itemDataList.count();
   for (z = 0; z < nAttribs; z++) {
-    qDebug("HlManager::makeAttribs: createing one attribute definition");
+    odebug << "HlManager::makeAttribs: createing one attribute definition" << oendl;
     itemData = itemDataList.at(z);
     if (itemData->defStyle) {
       // default style
       defaultStyle = defaultStyleList.at(itemData->defStyleNum);
       a[z].col = defaultStyle->col;
       a[z].selCol = defaultStyle->selCol;
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 6059e9b..9fa4452 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -13,21 +13,26 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "katesyntaxdocument.h"
-#include <kateconfig.h>
+#include "kateconfig.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+#include "klocale.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qfile.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
 #include <qstringlist.h>
-#include <kglobal.h>
-#include <qpe/qpeapplication.h>
 #include <qdir.h>
 
 SyntaxDocument::SyntaxDocument()
 {
   m_root=0;
   currentFile="";
@@ -73,27 +78,27 @@ void SyntaxDocument::setupModeList(bool force)
       mli->extension = config->readEntry("extension","");
       mli->identifier = path+*it;
       myModeList.append(mli);
     }
     else
     {
-	qDebug("Found a description file:"+path+(*it));
+    odebug << "Found a description file:"+path+(*it) << oendl;
         setIdentifier(path+(*it));
         Opie::Core::XMLElement *e=m_root;
         if (e)
         {
 	  e=e->firstChild();
-	  qDebug(e->tagName());
+      odebug << e->tagName() << oendl;
           if (e->tagName()=="language")
           {
             syntaxModeListItem *mli=new syntaxModeListItem;
             mli->name = e->attribute("name");
             mli->section = e->attribute("section");
             mli->mimetype = e->attribute("mimetype");
             mli->extension = e->attribute("extensions");
-	    qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
+        odebug << QString("valid description for: %1/%2").arg(mli->section).arg(mli->name) << oendl;
             if (mli->section.isEmpty())
               mli->section=i18n("Other");
 
             mli->identifier = path+(*it);
             config->setGroup(Group);
             config->writeEntry("name",mli->name);
@@ -289,13 +294,13 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
 	  if (e1->tagName()!="list") continue;
 
 	        if (e1->attribute("name")==type)
         	{
 			for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
 			{
-				qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
+                odebug << "FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value() << oendl;
 	            		m_data+=e2->firstChild()->value().stripWhiteSpace();
 			}
 	           break;
 		}
         }
       break;
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 96f91fb..782b629 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -15,29 +15,34 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_LANGLIST
+#include "kateconfig.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/global.h>
+
+/* QT */
 #include <qdir.h>
 #include <qmessagebox.h>
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include <qtextcodec.h>
 #endif
 #include <qtextstream.h>
 
+/* STD */
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define QTOPIA_INTERNAL_LANGLIST
-#include "kateconfig.h"
-#include <qpe/global.h>
-
 
 /*!
   \internal
 */
 QString KateConfig::configFilename(const QString& name, Domain d)
 {
@@ -90,13 +95,13 @@ QString KateConfig::configFilename(const QString& name, Domain d)
 
   In the File Domain, \a name is an absolute filename.
 */
 KateConfig::KateConfig( const QString &name, Domain domain )
     : filename( configFilename(name,domain) )
 {
-    qWarning("KateConfig constructor\n");
+    owarn << "KateConfig constructor\n" << oendl;
     git = groups.end();
     read();
     QStringList l = Global::languageList();
     lang = l[0];
     glang = l[1];
 }
@@ -115,13 +120,13 @@ KateConfig::KateConfig ( const QString &name, bool what )
 
 /*!
   Writes any changes to disk and destroys the in-memory object.
 */
 KateConfig::~KateConfig()
 {
-    qWarning("KateConfig destructor\n");
+    owarn << "KateConfig destructor\n" << oendl;
     if ( changed )
 	write();
 }
 
 /*!
   Returns whether the current group has an entry called \a key.
@@ -169,13 +174,13 @@ void KateConfig::writeEntry( const QString &key, const char* value )
 
   \sa readEntry()
 */
 void KateConfig::writeEntry( const QString &key, const QString &value )
 {
     if ( git == groups.end() ) {
-	qWarning( "no group set" );
+    owarn << "no group set" << oendl;
 	return;
     }
     if ( (*git)[key] != value ) {
 	( *git ).insert( key, value );
 	changed = TRUE;
     }
@@ -229,13 +234,13 @@ static QString decipher(const QString& cipher)
 
   \sa readEntry()
 */
 void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
 {
     if ( git == groups.end() ) {
-	qWarning( "no group set" );
+    owarn << "no group set" << oendl;
 	return;
     }
     QString evalue = encipher(value);
     if ( (*git)[key] != evalue ) {
 	( *git ).insert( key, evalue );
 	changed = TRUE;
@@ -318,13 +323,13 @@ void KateConfig::writeEntry( const QString &key, const QFont &val )
   there is no such entry.
 */
 
 void KateConfig::removeEntry( const QString &key )
 {
     if ( git == groups.end() ) {
-	qWarning( "no group set" );
+    owarn << "no group set" << oendl;
 	return;
     }
     ( *git ).remove( key );
     changed = TRUE;
 }
 
@@ -394,13 +399,13 @@ QString KateConfig::readEntryCrypt( const QString &key, const QString &deflt )
   \internal
   For compatibility, non-const version.
 */
 QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
 {
     if ( git == groups.end() ) {
-	//qWarning( "no group set" );
+    //owarn << "no group set" << oendl;
 	return deflt;
     }
     KateConfigGroup::ConstIterator it = ( *git ).find( key );
     if ( it != ( *git ).end() )
 	return *it;
     else
@@ -497,13 +502,13 @@ QValueList<int> KateConfig::readIntListEntry( const QString &key ) const
 /*!
   Removes all entries from the current group.
 */
 void KateConfig::clearGroup()
 {
     if ( git == groups.end() ) {
-	qWarning( "no group set" );
+    owarn << "no group set" << oendl;
 	return;
     }
     if ( !(*git).isEmpty() ) {
 	( *git ).clear();
 	changed = TRUE;
     }
@@ -518,13 +523,13 @@ void KateConfig::write( const QString &fn )
     if ( !fn.isEmpty() )
 	filename = fn;
     strNewFile = filename + ".new";
 
     QFile f( strNewFile );
     if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
-	qWarning( "could not open for writing `%s'", strNewFile.latin1() );
+    owarn << "could not open for writing `" << strNewFile << "'" << oendl;
 	git = groups.end();
 	return;
     }
     
     QString str;
     QCString cstr;    
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 3c9a637..9865c35 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -11,24 +11,29 @@
  *   This program is free softwaSre; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation.                                         *
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
-#include <qaction.h>
-#include <qtoolbutton.h>
-#include <qmenubar.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
 
+#include "tinykate.h"
+
+#include "katedocument.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ofiledialog.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
 
-#include "tinykate.h"
+/* QT */
+#include <qaction.h>
+#include <qtoolbutton.h>
+#include <qmenubar.h>
 
-#include <katedocument.h>
-#include <kglobal.h>
 
 using namespace Opie::Ui;
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
 {
   shutDown=false;
@@ -149,21 +154,21 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
   else slotNew();
 
 }
 
 TinyKate::~TinyKate( )
 {
-  qWarning("TinyKate destructor\n");
+  owarn << "TinyKate destructor\n" << oendl;
 
   shutDown=true;
   while (currentView!=0) {
     slotClose();
   }
 
   if( KGlobal::config() != 0 ) {
-    qWarning("deleting KateConfig object..\n");
+    owarn << "deleting KateConfig object..\n" << oendl;
     delete KGlobal::config();
   }
 }
 
 void TinyKate::slotOpen( )
 {
@@ -178,13 +183,13 @@ void TinyKate::open(const QString & filename)
 {
     KateDocument *kd= new KateDocument(false, false, this,0,this);
     KTextEditor::View *kv;
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
-    qDebug(filename);
+    odebug << filename << oendl;
 
     kd->setDocName( filenamed);
     kd->open( filename );
     viewCount++;
 }
 
@@ -246,13 +251,13 @@ void TinyKate::slotClose( )
 void TinyKate::slotSave() {
   // feel free to make this how you want
   if (currentView==0) return;
 
   //  KateView *kv = (KateView*) currentView;
   KateDocument *kd = (KateDocument*) currentView->document();
-  //  qDebug("saving file "+kd->docName());
+  //  odebug << "saving file "+kd->docName() << oendl;
   if( kd->docName().isEmpty())
     slotSaveAs();
   else
      kd->saveFile();
   //    kv->save();
   //    kd->saveFile();
@@ -262,13 +267,13 @@ void TinyKate::slotSaveAs() {
   if (currentView==0) return;
   KateDocument *kd = (KateDocument*) currentView->document();
 
   QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
                                                  QString::null);
   if (!filename.isEmpty()) {
-    qDebug("saving file "+filename);
+    odebug << "saving file "+filename << oendl;
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     kd->setDocFile( filename);
     kd->setDocName( filenamed);
     kd->saveFile();
 //   KTextEditor::View *dv = currentView;