- convert qDebug to odebug

1 files changed, 140 insertions, 139 deletions

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
@@ -19,6 +19,35 @@
 **********************************************************************/
+
 #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
@@ -27,8 +56,7 @@
 #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>
@@ -41,29 +69,10 @@
 #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
+
 
@@ -77,10 +86,2 @@
 
-#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&);
@@ -127,3 +128,3 @@ void QTReaderApp::listBkmkFiles()
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
                 d = QDir::home();
@@ -148,3 +149,3 @@ void QTReaderApp::listBkmkFiles()
 
-                        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+            //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
             ++it;                               // goto next list element
@@ -216,4 +217,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
                 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;
 
@@ -245,3 +246,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 
-//  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
+//  odebug << "Initial Rotation(" << m_rot << "):" << rot << "" << oendl;
 */
@@ -262,3 +263,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
                 d = QDir::home();
@@ -268,3 +269,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     QFileInfo fi(d, INIFILE);
-//    qDebug("Path:%s", (const char*)fi.absFilePath());
+//    odebug << "Path:" << fi.absFilePath() << "" << oendl;
     Config config(fi.absFilePath());
@@ -358,3 +359,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 */    
-//    qDebug("Reading file list");
+//    odebug << "Reading file list" << oendl;
     readfilelist();
@@ -369,3 +370,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 
-//    qDebug("Reading config");
+//    odebug << "Reading config" << oendl;
 //  Config config( APPDIR );
@@ -771,3 +772,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 
-//    qDebug("Font selector");
+//    odebug << "Font selector" << oendl;
     m_fontSelector = new QComboBox(false, m_fontBar);
@@ -803,7 +804,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 #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);
@@ -811,5 +812,5 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     {
-        //qDebug("doclnk");
+//  odebug << "doclnk" << oendl;
         //doc = new DocLnk(reader->m_lastfile);
-        //qDebug("doclnk done");
+//  odebug << "doclnk done" << oendl;
         if (pOpenlist != NULL)
@@ -833,3 +834,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
                 }
-        //      qDebug("Item:%s", (const char*)toQString(CFiledata(p->anno()).name()));
+//      odebug << "Item:" << toQString(CFiledata(p->anno()).name()) << "" << oendl;
                 p = NULL;
@@ -838,3 +839,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
             {
-        //qDebug("openfrombkmk");
+//  odebug << "openfrombkmk" << oendl;
                 if (!openfrombkmk(p))
@@ -844,3 +845,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
             {
-        //qDebug("openfile");
+//  odebug << "openfile" << oendl;
                 openFile( reader->m_lastfile );
@@ -850,3 +851,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
         {
-        //    qDebug("Openfile 2");
+//      odebug << "Openfile 2" << oendl;
             if (!reader->m_lastfile.isEmpty())
@@ -872,3 +873,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     }
-//    qDebug("finished update");
+//    odebug << "finished update" << oendl;
 }
@@ -1030,3 +1031,3 @@ QToolBar* QTReaderApp::filebar()
             case cesSingle:
-        //      qDebug("Setting filebar to menubar");
+//      odebug << "Setting filebar to menubar" << oendl;
                 fileBar = menubar;
@@ -1034,6 +1035,6 @@ QToolBar* QTReaderApp::filebar()
             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);
@@ -1055,3 +1056,3 @@ QToolBar* QTReaderApp::viewbar()
             default:
-                qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
             case cesSingle:
@@ -1071,3 +1072,3 @@ QToolBar* QTReaderApp::navbar()
             case cesMultiple:
-        //      qDebug("Creating new nav bar");
+//      odebug << "Creating new nav bar" << oendl;
                 navBar = new QToolBar("Navigation", this, m_tbposition);
@@ -1075,3 +1076,3 @@ QToolBar* QTReaderApp::navbar()
             default:
-                qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
             case cesSingle:
@@ -1079,3 +1080,3 @@ QToolBar* QTReaderApp::navbar()
                 navBar = fileBar;
-        //      qDebug("Setting navbar to filebar");
+//      odebug << "Setting navbar to filebar" << oendl;
                 break;
@@ -1095,3 +1096,3 @@ QToolBar* QTReaderApp::markbar()
             default:
-                qDebug("Incorrect toolbar policy set");
+        odebug << "Incorrect toolbar policy set" << oendl;
             case cesSingle:
@@ -1129,3 +1130,3 @@ void QTReaderApp::msgHandler(const QCString& _msg, const QByteArray& _data)
 
-////    qDebug("Received:%s", (const char*)msg);
+////    odebug << "Received:" << msg << "" << oendl;
 
@@ -1483,3 +1484,3 @@ 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());
@@ -1565,3 +1566,3 @@ void QTReaderApp::updatefileinfo()
     tchar* fl = fromQString(reader->m_lastfile);
-//    qDebug("Lastfile:%x", fl);
+//    odebug << "Lastfile:" << fl << "" << oendl;
     bool notadded = true;
@@ -1579,3 +1580,3 @@ void QTReaderApp::updatefileinfo()
                 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);
@@ -1588,3 +1589,3 @@ void QTReaderApp::updatefileinfo()
     }
-//    qDebug("Added?:%x", notadded);
+//    odebug << "Added?:" << notadded << "" << oendl;
     if (notadded)
@@ -1598,3 +1599,3 @@ void QTReaderApp::updatefileinfo()
         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;
@@ -1613,3 +1614,3 @@ void QTReaderApp::fileOpen()
 */
-//    qDebug("fileOpen");
+//    odebug << "fileOpen" << oendl;
 //    if (!reader->m_lastfile.isEmpty())
@@ -1654,3 +1655,3 @@ void QTReaderApp::fileOpen2()
 //    reader->refresh();
-//    qDebug("HEIGHT:%d", reader->m_lastheight);
+//    odebug << "HEIGHT:" << reader->m_lastheight << "" << oendl;
 }
@@ -1674,3 +1675,3 @@ QString QTReaderApp::usefilebrowser()
     }
-//    qDebug("Selected %s", (const char*)fn);
+//    odebug << "Selected " << fn << "" << oendl;
     delete fb;
@@ -1805,3 +1806,3 @@ void QTReaderApp::showprefs()
             default:
-                qDebug("Format out of range");
+        odebug << "Format out of range" << oendl;
         }
@@ -1865,3 +1866,3 @@ void QTReaderApp::showtoolbarprefs()
         {                       // "/tmp"
-                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+        owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
                 d = QDir::home();
@@ -1902,3 +1903,3 @@ void QTReaderApp::showtoolbarprefs()
         {                       // "/tmp"
-                qWarning( "Cannot find the \"~/%s\" directory", APPDIR );
+        owarn << "Cannot find the \"~/" << APPDIR << "\" directory" << oendl;
                 d = QDir::home();
@@ -2177,3 +2178,3 @@ void QTReaderApp::findNext()
 {
-//  //  qDebug("findNext called\n");
+//  //  odebug << "findNext called\n" << oendl;
 #ifdef __ISEARCH
@@ -2273,8 +2274,8 @@ bool QTReaderApp::dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg)
       }
-//      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;
@@ -2335,3 +2336,3 @@ void QTReaderApp::openFile( const QString &f )
 {
-//    qDebug("File:%s", (const char*)f);
+//    odebug << "File:" << f << "" << oendl;
 //    openFile(DocLnk(f));
@@ -2382,3 +2383,3 @@ void QTReaderApp::handlekey(QKeyEvent* e)
 {
-//    qDebug("Keypress event");
+//    odebug << "Keypress event" << oendl;
     timeb now;
@@ -2394,3 +2395,3 @@ void QTReaderApp::handlekey(QKeyEvent* e)
         case Key_Escape:
-        //    qDebug("escape event");
+//      odebug << "escape event" << oendl;
             if (m_disableesckey)
@@ -2409,3 +2410,3 @@ void QTReaderApp::handlekey(QKeyEvent* e)
                 {
-        //      qDebug("escape action");
+//      odebug << "escape action" << oendl;
                     doAction(m_escapeTarget, e);
@@ -2508,3 +2509,3 @@ void QTReaderApp::showEditTools()
     {
-        //qDebug("him");
+//  odebug << "him" << oendl;
 #ifdef USEQPE
@@ -2512,3 +2513,3 @@ void QTReaderApp::showEditTools()
 #endif
-        //qDebug("eb");
+//  odebug << "eb" << oendl;
         menubar->show();
@@ -2534,5 +2535,5 @@ void QTReaderApp::showEditTools()
         if (m_fontVisible) m_fontBar->show();
-        //qDebug("sn");
+//  odebug << "sn" << oendl;
         showNormal();
-        //qDebug("sm");
+//  odebug << "sm" << oendl;
 #ifdef USEQPE
@@ -2543,7 +2544,7 @@ void QTReaderApp::showEditTools()
 
-//    qDebug("uc");
+//    odebug << "uc" << oendl;
     updateCaption();
-//    qDebug("rw");
+//    odebug << "rw" << oendl;
     editorStack->raiseWidget( reader );
-//    qDebug("sf");
+//    odebug << "sf" << oendl;
     reader->setFocus();
@@ -2616,3 +2617,3 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
 {
-//    qDebug("Close event");
+//    odebug << "Close event" << oendl;
     if (m_fullscreen)
@@ -2633,3 +2634,3 @@ void QTReaderApp::closeEvent( QCloseEvent *e )
             {
-        //qDebug("Close disabled");
+//  odebug << "Close disabled" << oendl;
                 m_bcloseDisabled = false;
@@ -2711,3 +2712,3 @@ bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab)
 #ifdef _UNICODE
-        //      qDebug("Item:%s", (const char*)toQString(i->name()));
+//        odebug << "Item:" << toQString(i->name()) << "" << oendl;
             bkmkselector->insertItem(toQString(i->name()));
@@ -2740,5 +2741,5 @@ void QTReaderApp::do_regedit()
     reader->bDoUpdates = false;
-//    qDebug("Showing regbar");
+//    odebug << "Showing regbar" << oendl;
   regBar->show();
-//    qDebug("Showing kbd");
+//    odebug << "Showing kbd" << oendl;
 #ifdef USEQPE
@@ -2758,6 +2759,6 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
         );
-        //qDebug("fileinfo");
+//  odebug << "fileinfo" << oendl;
     if (!fn.isEmpty() && QFileInfo(fn).isFile())
     {
-        //qDebug("Opening");
+//  odebug << "Opening" << oendl;
         openFile(fn);
@@ -2783,3 +2784,3 @@ bool QTReaderApp::openfrombkmk(Bkmk* bk)
             }
-        //    qDebug("updating");
+//      odebug << "updating" << oendl;
         //    showEditTools();
@@ -2814,3 +2815,3 @@ void QTReaderApp::gotobkmk(int ind)
         case cDelBkmk:
-        ////    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
+////        odebug << "Deleting:" << (*pBkmklist)[ind]->name() << "\n" << oendl;
             pBkmklist->erase(ind);
@@ -2914,3 +2915,3 @@ void QTReaderApp::gotobkmk(int ind)
             int ret = f->exec();
-            qDebug("Return:%d", ret);
+        odebug << "Return:" << ret << "" << oendl;
             DocLnk* doc = f->getDoc();
@@ -2934,3 +2935,3 @@ void QTReaderApp::gotobkmk(int ind)
                 fm.saveFile( *doc, rt );
-                qDebug("YES");
+        odebug << "YES" << oendl;
             }
@@ -2938,3 +2939,3 @@ void QTReaderApp::gotobkmk(int ind)
             {
-                qDebug("NO");
+        odebug << "NO" << oendl;
             }
@@ -3011,3 +3012,3 @@ void QTReaderApp::do_regaction()
       case cSetConfigName:
-        //  qDebug("Saving config");
+//    odebug << "Saving config" << oendl;
           do_saveconfig(regEdit->text(), false);
@@ -3103,3 +3104,3 @@ void QTReaderApp::do_setencoding(int i)
 {
-//    qDebug("setencoding:%d", i);
+//    odebug << "setencoding:" << i << "" << oendl;
     if (m_fontAction == cChooseEncoding)
@@ -3111,5 +3112,5 @@ void QTReaderApp::do_setencoding(int i)
     m_fontVisible = false;
-//    qDebug("showedit");
+//    odebug << "showedit" << oendl;
     if (reader->isVisible()) showEditTools();
-//    qDebug("showeditdone");
+//    odebug << "showeditdone" << oendl;
 }
@@ -3125,6 +3126,6 @@ void QTReaderApp::do_setfont(const QString& lcn)
     m_fontVisible = false;
-//    qDebug("showedit");
+//    odebug << "showedit" << oendl;
     //if (reader->isVisible())
     showEditTools();
-//    qDebug("showeditdone");
+//    odebug << "showeditdone" << oendl;
 }
@@ -3135,3 +3136,3 @@ void QTReaderApp::do_autogen(const QString& regText)
     reader->sizes(fs,ts);
-//  //  qDebug("Reg:%s\n", (const tchar*)(regEdit->text()));
+//  //  odebug << "Reg:" << (const tchar*)(regEdit->text()) << "\n" << oendl;
   m_autogenstr = regText;
@@ -3182,3 +3183,3 @@ void QTReaderApp::saveprefs()
 {
-//    qDebug("saveprefs");
+//    odebug << "saveprefs" << oendl;
 //  reader->saveprefs("uqtreader");
@@ -3263,7 +3264,7 @@ 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;
 }
@@ -3343,6 +3344,6 @@ void QTReaderApp::readfilelist()
 #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;
 }
@@ -3361,3 +3362,3 @@ void QTReaderApp::savefilelist()
 #endif /* USEQPE */
-        //qDebug("Writing open files");
+//  odebug << "Writing open files" << oendl;
         bf.write(*pOpenlist);
@@ -3471,3 +3472,3 @@ void QTReaderApp::OnWordSelected(const QString& wrd, size_t posn, const QString&
 {
-////    qDebug("OnWordSelected(%u):%s", posn, (const char*)wrd);
+////    odebug << "OnWordSelected(" << posn << "):" << wrd << "" << oendl;
 
@@ -3521,3 +3522,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
         e->accept();
-        //qDebug("Accepted");
+//  odebug << "Accepted" << oendl;
         switch (a)
@@ -3584,3 +3585,3 @@ void QTReaderApp::doAction(ActionTypes a, QKeyEvent* e)
             default:
-                qDebug("Unknown ActionType:%u", a);
+        odebug << "Unknown ActionType:" << a << "" << oendl;
                 break;
@@ -3602,3 +3603,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
 {
-//    qDebug("do_saveconfig:%s", (const char*)_txt);
+//    odebug << "do_saveconfig:" << _txt << "" << oendl;
 #ifdef USEQPE
@@ -3625,3 +3626,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
         {
-        //    qDebug("full:%s", (const char*)_txt);
+//      odebug << "full:" << _txt << "" << oendl;
             QDir d = QDir::home();                      // "/"
@@ -3629,3 +3630,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+            owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
                         d = QDir::home();
@@ -3641,3 +3642,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
                         d = QDir::home();
@@ -3648,3 +3649,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
                         d = QDir::home();
@@ -3656,3 +3657,3 @@ void QTReaderApp::do_saveconfig(const QString& _txt, bool full)
         }
-        //qDebug("Path:%s", (const char*)fi.absFilePath());
+//  odebug << "Path:" << fi.absFilePath() << "" << oendl;
         Config config(fi.absFilePath());
@@ -3936,3 +3937,3 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/%s\" directory", (const char*)_txt );
+            owarn << "Cannot find the \"~/" << _txt << "\" directory" << oendl;
                         d = QDir::home();
@@ -3948,3 +3949,3 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
                         d = QDir::home();
@@ -3955,3 +3956,3 @@ bool QTReaderApp::readconfig(const QString& _txt, bool full=false)
                 {                       // "/tmp"
-                        qWarning( "Cannot find the \"~/" APPDIR "/configs\" directory" );
+            owarn << "Cannot find the \"~/" APPDIR "/configs\" directory" << oendl;
                         d = QDir::home();
@@ -4063,3 +4064,3 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+        owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
         d = QDir::home();
@@ -4069,3 +4070,3 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
     if ( !d.cd(tgtdir) ) {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "/%s\" directory", tgtdir );
+        owarn << "Cannot find the \"~/" APPDIR "/" << tgtdir << "\" directory" << oendl;
         d = QDir::home();
@@ -4086,3 +4087,3 @@ bool QTReaderApp::PopulateConfig(const char* tgtdir)
                         
-        //qDebug( "%10li %s", fi->size(), fi->fileName().data() );
+    //odebug << "" << fi->size() << " " << fi->fileName().data() << "" << oendl;
         ++it;                               // goto next list element
@@ -4170,3 +4171,3 @@ void QTReaderApp::OnURLSelected(const QString& href)
             cb->setText(href);
-            qDebug("<a href=\"%s\">%s</a>", (const char*)href, (const char*)href);
+        odebug << "<a href=\"" << href << "\">" << href << "</a>" << oendl;
         }
@@ -4194,3 +4195,3 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
     {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
+    owarn << "Cannot find the \"~/" APPDIR "\" directory" << oendl;
         d = QDir::home();
@@ -4201,3 +4202,3 @@ void QTReaderApp::writeUrl(const QString& file, const QString& href)
     {                       // "/tmp"
-        qWarning( "Cannot find the \"~/" APPDIR "/urls\" directory" );
+    owarn << "Cannot find the \"~/" APPDIR "/urls\" directory" << oendl;
         d = QDir::home();