1 files changed, 78 insertions, 70 deletions

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();
                 }
         }
     }