1 files changed, 12 insertions, 8 deletions

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
@@ -2,71 +2,75 @@
                           gutenbrowser.cpp  -  description
                              -------------------
     begin                : Mon Jul 24 22:33:12 MDT 2000
     copyright            : (C) 2000 -2004 by llornkcor
     email                : ljp@llornkcor.com
 ***************************************************************************/
 /***************************************************************************
  *   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()));
     connect(OpenButton,SIGNAL(released()),SLOT(OpenBtn()));
     connect(SearchButton,SIGNAL(released()),SLOT(SearchBtn()));
     connect(ForwardButton,SIGNAL(clicked()),SLOT(ForwardBtn()));
     connect(BackButton,SIGNAL(clicked()),SLOT(BackBtn()));
     connect(setBookmarkButton,SIGNAL(released()),SLOT(setBookmark()));
     connect(dictionaryButton,SIGNAL(released()),SLOT(LookupBtn()));
     connect(InfoBar,SIGNAL(clicked()),SLOT(InfoBarClick()));
     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;
         system(msg);
 //     QDir pixdir(local_library+"pix");
 //     if ( !pixdir.exists()) {
 //         pixdir.mkdir(local_library+"pix", TRUE);
 //         QString msg;
 //         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" );
 //useWordWrap_CheckBox
     useIcons=TRUE;
 #else
 
     config.setGroup( "General" );
     QString s_Split=config.readEntry("Splitter", "TRUE" );
@@ -138,39 +142,39 @@ void Gutenbrowser::initConfig() {
     ftp_base_dir= config.readEntry("base",  "/pub/gutenberg");
 
                         //bool ok2;
     QString temp;
     QString copying;
     copying="";
 
     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()) );
 //    fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) );
     fileMenu->insertItem( Resource::loadPixmap("home"),
                           "Download Library Index", this, SLOT( downloadLibIndex()) );
     fileMenu->insertItem( Resource::loadPixmap("quit"),
                           "Quit Gutenbrowser...", this, SLOT( ByeBye()) );
       // menuBar entry editMenu
@@ -198,25 +202,25 @@ void Gutenbrowser::initMenuBar()
     menubar->insertItem("File", fileMenu);
     menubar->insertItem("Page", editMenu);
     menubar->insertItem("Options", optionsMenu);
 //    menubar->insertItem("More Info", donateMenu);
 
     menu->addWidget( menubar,0);
 
     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 );
 
     BackButton = new QPushButton( this, "BackButton" );
     BackButton->setFocusPolicy( QWidget::TabFocus );
     BackButton->setAutoRepeat(TRUE);
 
     ForwardButton = new QPushButton( this, "ForwardButton" );
@@ -232,25 +236,25 @@ void Gutenbrowser::initButtonBar()
     lastBmkButton = new MenuButton( this, "lastBmkButton" );
     lastBmkButton->setFocusPolicy( QWidget::TabFocus );
 
     bookmarksMenu = new QPopupMenu();
     bookmarksMenu->insertItem("Last Set", this, SLOT(Bookmark( int) ));
     
     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);
     buttons2->addWidget(BackButton, 0, AlignCenter);
     buttons2->addWidget(ForwardButton, 0, AlignCenter);
     buttons2->addWidget(SearchButton, 0, AlignCenter);
     buttons2->addWidget(setBookmarkButton, 0, AlignCenter);
     buttons2->addWidget(lastBmkButton, 0, AlignCenter);
     buttons2->addWidget(dictionaryButton, 0, AlignCenter);
@@ -284,25 +288,25 @@ void Gutenbrowser::initView()
     QFont defaultFont=Lview->font();
     QFontInfo fontInfo(defaultFont);
 
     QString family = cfg.readEntry("Family", fontInfo.family());
     QString style = cfg.readEntry("Style", fdb.styleString(defaultFont));
     int i_size = cfg.readNumEntry("Size", fontInfo.pointSize()/10);
     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();
 
     cfg.setGroup("General");
 
     if( cfg.readBoolEntry("WordWrap", 1)) {
         Lview->setWordWrap(QMultiLineEdit::WidgetWidth);
         useWrap=true;