12 files changed, 114 insertions, 94 deletions

diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp
index 58bde2a..c9e1dc5 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/apps/keyz-cfg/zkb.cpp
@@ -1,7 +1,11 @@
 #include "zkb.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
 #include <stdio.h>
 
 // Implementation of Action class
 Action::Action():state(0), keycode(0), unicode(0), flags(0) {
 }
 
@@ -249,14 +253,14 @@ Keymap::~Keymap() {
         states.clear();
 }
 
 bool Keymap::filter(int unicode, int keycode, int modifiers,
         bool isPress, bool autoRepeat) {
 
-        qDebug("filter: >>> unicode=%x, keycode=%x, modifiers=%x, "
-                "ispressed=%x\n", unicode, keycode, modifiers, isPress);
+    odebug << "filter: >>> unicode=" << unicode << ", keycode=" << keycode
+           << ", modifiers=" << modifiers << ", ispressed=" << isPress << oendl;
 
         if (!enabled) {
                 return false;
         }
 
         // the second check is workaround to make suspend work if
@@ -272,16 +276,14 @@ bool Keymap::filter(int unicode, int keycode, int modifiers,
         Action* action = currentState->get(keycode, isPress, true);
         if (action==0 || !action->isDefined()) {
                 return true;
         }
 
         if (action->hasEvent()) {
-                qDebug("filter:<<< unicode=%x, keycode=%x, modifiers=%x, "
-                        "ispressed=%x\n", action->getUnicode(), 
-                        action->getKeycode(), action->getModifiers(),
-                        action->isPressed());
+        odebug << "filter:<<< unicode=" << action->getUnicode() << ", keycode=" << action->getKeycode()
+               << ", modifiers=" << action->getModifiers() << ", ispressed=" << action->isPressed() << oendl;
 
                 QWSServer::sendKeyEvent(action->getUnicode(),
                         action->getKeycode(), action->getModifiers(),
                         action->isPressed(), false);
         }
 
@@ -401,14 +403,13 @@ bool Keymap::setCurrentState(State* state) {
         for(it = states.begin(); it != states.end(); ++it) {
                 State* s = it.data();
                 if (s == state) {
                         currentState = s;
                         currentStateName = it.key();
 
-                        qDebug("state changed: %s\n", (const char*) 
-                                currentStateName.utf8());
+            odebug << "state changed: " << (const char*)currentStateName.utf8() << oendl;
 
                         if (!lsmapInSync) {
                                 generateLabelStateMaps();
                         }
 
                         QMap<State*, QString>::Iterator tit;
@@ -460,17 +461,16 @@ bool Keymap::removeState(const QString& name, bool force) {
 
         return true;
 }
 
 void Keymap::autoRepeat() {
         if (autoRepeatAction != 0) {
-                qDebug("filter:<<< unicode=%x, keycode=%x, modifiers=%x, "
-                        "ispressed=%x\n", autoRepeatAction->getUnicode(),
-                        autoRepeatAction->getKeycode(),
-                        autoRepeatAction->getModifiers(),
-                        autoRepeatAction->isPressed());
+        odebug << "filter:<<< unicode=" << autoRepeatAction->getUnicode()
+               << ", keycode=" << autoRepeatAction->getKeycode()
+               << ", modifiers=" << autoRepeatAction->getModifiers()
+               << "ispressed=" << autoRepeatAction->isPressed() << oendl;
 
                 QWSServer::sendKeyEvent(autoRepeatAction->getUnicode(),
                         autoRepeatAction->getKeycode(), 
                         autoRepeatAction->getModifiers(),
                         autoRepeatAction->isPressed(), true);
         }
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index be2b897..f14080f 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -418,14 +418,15 @@ void Gutenbrowser::ForwardBtn() {
                     //        Lview->MultiLine_Ex::pageDown( FALSE);
                 i_pageNum++;
                 pageStopArray.resize(i_pageNum + 1);
                     //          int length = Lview->length();
 
                 pageStopArray[i_pageNum ] = currentFilePos;
-                    //         qDebug("%d current page is number %d, pagesize %d, length %d, current %d",
-                    //                currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] );
+                    //         odebug << currentFilePos << " current page is number " << i_pageNum
+                    //                << ", pagesize " << pageSize << ", length " << Lview->length()
+                    //                << ", current " << pageStopArray[i_pageNum] << oendl;
                 setStatus();
                 Lview->setCursorPosition( 0, 0, FALSE);
                     //        }
 
         } else {
                     //         odebug << "bal" << oendl;
@@ -452,14 +453,15 @@ void Gutenbrowser::BackBtn() {
                 int pageSize= Lview->PageSize();
                     //        int length=Lview->length();
 
                 i_pageNum--;
                 currentFilePos = f.at();
 
-                    //         qDebug("%d move back to %d, current page number %d, %d, length %d",
-                    //                currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() );
+                    //         odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ]
+                    //                << ", current page number " << i_pageNum
+                    //                << ", " << pageSize << ", length " << Lview->length() << oendl;
 
                 if(  i_pageNum < 2) {
                         f.at( 0);
                 } else {
                         if(!f.at( pageStopArray[i_pageNum - 1] ))
                                 odebug << "File positioned backward did not work" << oendl;
@@ -796,14 +798,15 @@ bool Gutenbrowser::load( const char *fileName) {
 
             //    int length = Lview->length();
         currentFilePos = f.at();
 
         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() );
+        odebug << "<<<<<<<<<<<" << currentFilePos << " current page is number " << i_pageNum
+               << ", length " << Lview->length() << ", current " << pageStopArray[i_pageNum]
+               << ", pageSize " << Lview->PageSize() << oendl;
 
         Lview->setMaxLines(Lview->PageSize()*2);
         odebug << "Gulped " << currentLine << "" << oendl;
         setCaption(title);
         Lview->setAutoUpdate( TRUE);
 
diff --git a/noncore/apps/opie-reader/BuffDoc.h b/noncore/apps/opie-reader/BuffDoc.h
index 29d0329..61531c0 100644
--- a/noncore/apps/opie-reader/BuffDoc.h
+++ b/noncore/apps/opie-reader/BuffDoc.h
@@ -53,13 +53,13 @@ class BuffDoc
         }
     BuffDoc()
         {
             exp = NULL;
             filt = NULL;
             lastword.empty();
-        //    //    qDebug("Buffdoc created");
+        //    odebug << "Buffdoc created" << oendl;
         }
     bool empty() { return (exp == NULL); }
     void setfilter(CFilterChain* _f)
         {
             if (filt != NULL) delete filt;
             filt = _f;
diff --git a/noncore/apps/opie-reader/CEncoding.h b/noncore/apps/opie-reader/CEncoding.h
index 463fba9..df0104a 100644
--- a/noncore/apps/opie-reader/CEncoding.h
+++ b/noncore/apps/opie-reader/CEncoding.h
@@ -58,14 +58,14 @@ public:
 class CGeneral8Bit : public CEncoding
 {
     int m_index;
  public:
     CGeneral8Bit(int _i) : m_index(_i)
         {
-        //    qDebug("8Bit:%d", _i);
-        //    qDebug("%s", unicodetable::iterator(_i)->mime);
+//      odebug << "8Bit: " << _i << oendl;
+//      odebug << unicodetable::iterator(_i)->mime << oendl;
         }
     void getch(tchar& ch, CStyle& sty)
         {
             parent->getch(ch, sty);
             ch = unicodetable::unicodevalue(m_index, ch);
         }
diff --git a/noncore/apps/opie-reader/CExpander.h b/noncore/apps/opie-reader/CExpander.h
index 7b21d3e..9fae245 100644
--- a/noncore/apps/opie-reader/CExpander.h
+++ b/noncore/apps/opie-reader/CExpander.h
diff --git a/noncore/apps/opie-reader/Filedata.h b/noncore/apps/opie-reader/Filedata.h
index 096dd31..1b85b71 100644
--- a/noncore/apps/opie-reader/Filedata.h
+++ b/noncore/apps/opie-reader/Filedata.h
@@ -23,17 +23,17 @@ class CFiledata
         }
     ~CFiledata()
         {
             if (m_own && data != NULL)
                 {
                     delete [] data;
-        //      qDebug("~Filedata: deleting");
+//      odebug << "~Filedata: deleting" << oendl;
                 }
             else
             {
-        //      qDebug("~Filedata: not deleting");
+//      odebug << "~Filedata: not deleting" << oendl;
             }
         }
     tchar* name() const { return (tchar*)(data+sizeof(time_t)); }
     time_t date() { return *((time_t *)data); }
     void setdate(time_t _t) { *((time_t *)data) = _t; }
     unsigned char* content() { return data; }
diff --git a/noncore/apps/opie-reader/FontControl.h b/noncore/apps/opie-reader/FontControl.h
index 5681496..e56b619 100644
--- a/noncore/apps/opie-reader/FontControl.h
+++ b/noncore/apps/opie-reader/FontControl.h
@@ -101,13 +101,13 @@ class FontControl
             {
                 if (--m_size < 0)
                 {
                     m_size = 0;
                 }
             }
-        //    qDebug("Font:%d Graphics:%d", m_size, g_size);
+//      odebug << "Font:" << m_size << " Graphics:" << g_size << oendl;
             return true;
         }
     bool increasesize()
         {
 /*
             if (++m_size >= m_maxsize)
@@ -121,13 +121,13 @@ class FontControl
             {
                 if (++m_size >= m_maxsize)
                 {
                     m_size = m_maxsize - 1;
                 }
             }
-        //    qDebug("Font:%d Graphics:%d", m_size, g_size);
+//      odebug << "Font:" << m_size << " Graphics:" << g_size << oendl;
             return true;
         }
     bool ChangeFont(QString& n)
         {
             return ChangeFont(n, currentsize());
         }
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp
index 9339595..b0d4e00 100644
--- a/noncore/apps/opie-reader/Palm2QImage.cpp
+++ b/noncore/apps/opie-reader/Palm2QImage.cpp
@@ -1,18 +1,25 @@
 /* -*- mode: c; indent-tabs-mode: nil; -*- */
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qimage.h>
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifndef _WINDOWS
 #include <unistd.h>     /* for link */
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
 
-#include <qimage.h>
 
 /***********************************************************************/
 /***********************************************************************/
 /*****                                                             *****/
 /*****   Code to decode the Palm image format to JPEG              *****/
 /*****                                                             *****/
@@ -138,22 +145,24 @@ QImage* Palm2QImage
   next_depth_offset = READ_BIGENDIAN_SHORT(palmimage + 10);
   transparent_index = palmimage[12];
   compression_type = palmimage[13];
   /* bytes 14 and 15 are reserved by Palm and always 0 */
   
 #if 0
-//  qDebug ("Palm image is %dx%d, %d bpp, version %d, flags 0x%x, compression %d", width, height, bits_per_pixel, version, flags, compression_type);
+//  odebug << "Palm image is " << width << "x" << height
+//         << ", " << bits_per_pixel << " bpp, version " << version
+//         << ", flags 0x" << flags << ", compression " << compression_type << oendl;
 #endif
 
   if (compression_type == PALM_COMPRESSION_PACKBITS) {
-//    qDebug ("Image uses packbits compression; not yet supported");
+//    odebug << "Image uses packbits compression; not yet supported" << oendl;
     return NULL;
   } else if ((compression_type != PALM_COMPRESSION_NONE) &&
     (compression_type != PALM_COMPRESSION_RLE) &&
       (compression_type != PALM_COMPRESSION_SCANLINE)) {
-//    qDebug ("Image uses unknown compression, code 0x%x", compression_type);
+//    odebug << "Image uses unknown compression, code 0x" << compression_type << oendl;
     return NULL;
   }
 
   /* as of PalmOS 4.0, there are 6 different kinds of Palm pixmaps:
      
      1, 2, or 4 bit grayscale
@@ -165,13 +174,13 @@ QImage* Palm2QImage
      "RLE", "Scanline", "PackBits", or none.
      
      We begin by constructing the colormap.
      */
 
   if (flags & PALM_HAS_COLORMAP_FLAG) {
-//    qDebug("Palm images with custom colormaps are not currently supported.\n");
+//    odebug << "Palm images with custom colormaps are not currently supported." << oendl;
     return NULL;
   } else if (bits_per_pixel == 1) {
     colormap = Palm1BitColormap;
     imagedatastart = palmimage + 16;
   } else if (bits_per_pixel == 2) {
     colormap = Palm2BitColormap;
@@ -184,24 +193,26 @@ QImage* Palm2QImage
     imagedatastart = palmimage + 16;
   } else if (bits_per_pixel == 16 && (flags & PALM_DIRECT_COLOR_FLAG)) {
     colormap = NULL;
     palm_red_bits = palmimage[16];
     palm_green_bits = palmimage[17];
     palm_blue_bits = palmimage[18];
-//    qDebug("Bits:%d, %d, %d", palm_red_bits, palm_green_bits, palm_blue_bits);
+//    odebug << "Bits:" << palm_red_bits << ", " << palm_green_bits << ", " << palm_blue_bits << oendl;
     if (palm_blue_bits > 8 || palm_green_bits > 8 || palm_red_bits > 8) {
-//      qDebug("Can't handle this format DirectColor image -- too wide in some color (%d:%d:%d)\n", palm_red_bits, palm_green_bits, palm_blue_bits);
+//      odebug << "Can't handle this format DirectColor image -- too wide in some color ("
+//             << palm_red_bits << ":" << palm_green_bits << ":" << palm_blue_bits << oendl;
       return NULL;
     }
     if (bits_per_pixel > (8 * sizeof(unsigned long))) {
-//      qDebug ("Can't handle this format DirectColor image -- too many bits per pixel (%d)\n", bits_per_pixel);
+//      odebug << "Can't handle this format DirectColor image -- too many bits per pixel ("
+//             << bits_per_pixel << ")" << oendl;
       return NULL;
     }
     imagedatastart = palmimage + 24;
   } else {
-//    qDebug("Unknown bits-per-pixel of %d encountered.\n", bits_per_pixel);
+//    odebug << "Unknown bits-per-pixel of " << bits_per_pixel << " encountered" << oendl;
     return NULL;
   }
 
 #ifndef USEQPE
   QImage* qimage = new QImage(width, height, 32);
 #else
@@ -210,13 +221,14 @@ QImage* Palm2QImage
 
   /* row by row, uncompress the Palm image and copy it to the JPEG buffer */
   rowbuf = new unsigned char[bytes_per_row * width];
   lastrow = new unsigned char[bytes_per_row * width];
 
   for (i=0, palm_ptr = imagedatastart , x_ptr = imagedata;  i < height;  ++i) {
-//        qDebug("inval:%x palm_ptr:%x x_ptr:%x bpr:%x", inval, palm_ptr, x_ptr, bytes_per_row);
+//        odebug << "inval:" << inval << " palm_ptr:" << palm_ptr << " x_ptr:" << x_ptr
+//               << " bpr:" << bytes_per_row << oendl;
 
     /* first, uncompress the Palm image */
     if ((flags & PALM_IS_COMPRESSED_FLAG) && (compression_type == PALM_COMPRESSION_RLE)) {
       for (j = 0;  j < bytes_per_row;  ) {
         incount = *palm_ptr++;
         inval = *palm_ptr++;
@@ -240,18 +252,18 @@ QImage* Palm2QImage
                ((flags & PALM_IS_COMPRESSED_FLAG) == 0))
     {
         memcpy (rowbuf, palm_ptr, bytes_per_row);
         palm_ptr += bytes_per_row;
     }
     else {
-        qDebug("Case 4");
-        qDebug("Is compressed:%s", ((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true");
-        qDebug("Has colourmap:%s", ((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true");
-        qDebug("Has transparency:%s", ((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true");
-        qDebug("Direct colour:%s", ((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true");
-        qDebug("four byte field:%s", ((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true");
+        odebug << "Case 4" << oendl;
+        odebug << "Is compressed:" << (((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true") << oendl;
+        odebug << "Has colourmap:" << (((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true") << oendl;
+        odebug << "Has transparency:" << (((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true") << oendl;
+        odebug << "Direct colour:" << (((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true") << oendl;
+        odebug << "four byte field:" << (((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true") << oendl;
       memcpy (rowbuf, palm_ptr, bytes_per_row);
       palm_ptr += bytes_per_row;
     }
     /* next, write it to the GDK bitmap */
     if (colormap) {
       mask = (1 << bits_per_pixel) - 1;
@@ -272,17 +284,16 @@ QImage* Palm2QImage
     } else if (!colormap &&
       bits_per_pixel == 16) {
       for (inbyte = rowbuf, j = 0; j < width; ++j) {
         inval = ((unsigned short)inbyte[0] << (unsigned short)8) | inbyte[1];
 
 /*
-        qDebug ("pixel is %d,%d (%d:%d:%d)",
-                      j, i,
-                      ((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits),
-                      ((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits),
-                      ((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits));
+    odebug << "pixel is " << j << "," << i << " ("
+           << (((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits)) << ":"
+           << (((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits)) << ":"
+           << (((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits)) << ")" << oendl;
 */
         QRgb colour = qRgb(
             ((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits), 
             ((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits),
             ((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits));
         qimage->setPixel(j, i, colour);
@@ -296,13 +307,13 @@ QImage* Palm2QImage
 
   return qimage;
 }
 
 QImage* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b)
 {
-////    qDebug("hrule [%d, %d]", w, h);
+//    odebug << "hrule [" << w << ", " << h << "]" << oendl;
     QPixmap* qimage = new QPixmap(w, h);
     qimage->fill(QColor(r,g,b));
     QImage* ret = new QImage(qimage->convertToImage());
     delete qimage;
     return ret;
 }
diff --git a/noncore/apps/opie-reader/QTReader.h b/noncore/apps/opie-reader/QTReader.h
index dfbdfb9..f89de63 100644
--- a/noncore/apps/opie-reader/QTReader.h
+++ b/noncore/apps/opie-reader/QTReader.h
@@ -133,29 +133,29 @@ public:
             m_encd = _f;
             setfilter(getfilter());
         }
     MarkupType PreferredMarkup();
     CEncoding* getencoding()
         {
-        //    qDebug("m_encd:%d", m_encd);
+//      odebug << "m_encd:" << m_encd << oendl;
             switch (m_encd)
             {
                 case 4:
-        //          qDebug("palm");
+//          odebug << "palm" << oendl;
                     return new CPalm;
                 case 1:
-        //          qDebug("utf8");
+//          odebug << "utf8" << oendl;
                     return new CUtf8;
                 case 2:
-        //          qDebug("ucs16be");
+//          odebug << "ucs16be" << oendl;
                     return new CUcs16be;
                 case 3:
-        //          qDebug("ucs16le");
+//          odebug << "ucs16le" << oendl;
                     return new CUcs16le;
                 case 0:
-        //          qDebug("ascii");
+//          odebug << "ascii" << oendl;
                     return new CAscii;
                 default:
                     return new CGeneral8Bit(m_encd-MAX_ENCODING+1);
             }
         }
   CFilterChain* getfilter()
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index ab6f60e..fe3eebf 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -396,14 +396,14 @@ private slots:
     bool bFromDocView;
     static unsigned long m_uid;
     long unsigned get_unique_id() { return m_uid++; }
     /*
       void resizeEvent( QResizeEvent * r)
       {
-//      qDebug("resize:(%u,%u)", r->oldSize().width(), r->oldSize().height());
-//      qDebug("resize:(%u,%u)", r->size().width(), r->size().height());
+//      odebug << "resize:(" << r->oldSize().width() << "," << r->oldSize().height() << ")" << oendl;
+//      odebug << "resize:(" << r->size().width() << "," << r->size().height() << ")" << oendl;
       //    bgroup->move( width()-bgroup->width(), 0 );
       }
     */
     CList<Bkmk>* pBkmklist;
     CList<Bkmk>* pOpenlist;
     infowin*  m_infoWin;
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.h b/noncore/apps/tinykate/libkate/document/katedocument.h
index 9d8ec6a..969be87 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.h
+++ b/noncore/apps/tinykate/libkate/document/katedocument.h
@@ -73,13 +73,13 @@ public:
     }
     int width(QChar c) {
         uchar cell=c.cell();
         uchar row=c.row();
         short *wa=warray[row];
         if (!wa) {
-                // qDebug("create row: %d",row);
+                // odebug << "create row: " << row << oendl;
                 wa=warray[row]=new short[256];
                 for (int i=0; i<256; i++) wa[i]=-1;
         }
         if (wa[cell]<0) wa[cell]=(short) QFontMetrics::width(c);
         return (int)wa[cell];
     }
diff --git a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
index a2c680f..78635b2 100644
--- a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
+++ b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
@@ -35,26 +35,32 @@
 **
 **********************************************************************/
 #if QT_VERSION >=300
 #error QRegExp3 is now in QT 3 use QRegExp instead
 #endif
 
-#include "qarray.h"
-#include "qbitarray.h"
-#include "qcache.h"
-#include "qintdict.h"
-#include "qmap.h"
 #if QT_VERSION < 300
 #include "./qregexp3.h"
 #else
 #include "qregexp.h"
 #endif
-#include "qstring.h"
-#include "qtl.h"
-#include "qvector.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qarray.h>
+#include <qbitarray.h>
+#include <qcache.h>
+#include <qintdict.h>
+#include <qmap.h>
+#include <qstring.h>
+#include <qtl.h>
+#include <qvector.h>
+
+/* STD */
 #include <limits.h>
 
 /*
   WARNING!  Be sure to read qregexp.tex before modifying this file.
 */
 
@@ -1428,56 +1434,56 @@ void QRegExpEngine::heuristicallyChooseHeuristic()
 #endif
 
 #if defined(QT_DEBUG)
 void QRegExpEngine::dump() const
 {
     int i, j;
-    qDebug( "Case %ssensitive engine", cs ? "" : "in" );
-    qDebug( "  States" );
+    odebug << "Case " << (cs ? "" : "in") << "sensitive engine" << oendl;
+    odebug << "  States" << oendl;
     for ( i = 0; i < ns; i++ ) {
-        qDebug( "  %d%s", i,
-                i == InitialState ? " (initial)" :
-                i == FinalState ? " (final)" : "" );
+    odebug << "  " << i
+           << (i == InitialState ? " (initial)" : i == FinalState ? " (final)" : "") << oendl;
+
 #ifndef QT_NO_REGEXP_CAPTURE
-        qDebug( "    in atom %d", s[i]->atom );
+    odebug << "    in atom " << s[i]->atom << oendl;
 #endif
         int m = s[i]->match;
         if ( (m & CharClassBit) != 0 ) {
-            qDebug( "    match character class %d", m ^ CharClassBit );
+        odebug << "    match character class " << (m ^ CharClassBit) << oendl;
 #ifndef QT_NO_REGEXP_CCLASS
             cl[m ^ CharClassBit]->dump();
 #else
-            qDebug( "    negative character class" );
+        odebug << "    negative character class" << oendl;
 #endif
         } else if ( (m & BackRefBit) != 0 ) {
-            qDebug( "    match back-reference %d", m ^ BackRefBit );
+        odebug << "    match back-reference " << (m ^ BackRefBit) << oendl;
         } else if ( m >= 0x20 && m <= 0x7e ) {
-            qDebug( "    match 0x%.4x (%c)", m, m );
+        odebug << "    match " << QString().sprintf( "0x%.4x", m) << " (" << m << ")" << oendl;
+
         } else {
-            qDebug( "    match 0x%.4x", m );
+        odebug << "    match " << QString().sprintf( "0x%.4x", m) << oendl;
         }
         for ( j = 0; j < (int) s[i]->outs.size(); j++ ) {
             int next = s[i]->outs[j];
-            qDebug( "    -> %d", next );
+        odebug << "    -> " << next << oendl;
             if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) )
-                qDebug( "       [reenter %d]", (*s[i]->reenter)[next] );
+        odebug << "       [reenter " << (*s[i]->reenter)[next] << "]" << oendl;
             if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 )
-                qDebug( "       [anchors 0x%.8x]", (*s[i]->anchors)[next] );
+        odebug << "       [anchors " << QString().sprintf( "0x%.8x]", (*s[i]->anchors)[next] ) << oendl;
         }
     }
 #ifndef QT_NO_REGEXP_CAPTURE
     if ( nf > 0 ) {
-        qDebug( "  Atom    Parent  Capture" );
+    odebug << "  Atom    Parent  Capture" << oendl;
         for ( i = 0; i < nf; i++ )
-            qDebug( "  %6d  %6d  %6d", i, f[i].parent, f[i].capture );
+        odebug << QString().sprintf("  %6d  %6d  %6d", i, f[i].parent, f[i].capture ) << oendl;
     }
 #endif
 #ifndef QT_NO_REGEXP_ANCHOR_ALT
     for ( i = 0; i < (int) aa.size(); i++ )
-        qDebug( "  Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a,
-                aa[i].b );
+    odebug << QString().sprintf("  Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, aa[i].b ) << oendl;
 #endif
 }
 #endif
 
 void QRegExpEngine::setup( bool caseSensitive )
 {
@@ -2193,19 +2199,19 @@ bool QRegExpEngine::CharClass::in( QChar ch ) const
 }
 
 #if defined(QT_DEBUG)
 void QRegExpEngine::CharClass::dump() const
 {
     int i;
-    qDebug( "    %stive character class", n ? "nega" : "posi" );
+    odebug << "    " << (n ? "nega" : "posi") << "tive character class" << oendl;
 #ifndef QT_NO_REGEXP_CCLASS
     if ( c != 0 )
-        qDebug( "      categories 0x%.8x", c );
+    odebug << QString().sprintf("      categories 0x%.8x", c ) << oendl;
 #endif
     for ( i = 0; i < (int) r.size(); i++ )
-        qDebug( "      0x%.4x through 0x%.4x", r[i].from, r[i].to );
+    odebug << QString().sprintf("      0x%.4x through 0x%.4x", r[i].from, r[i].to ) << oendl;
 }
 #endif
 #endif
 
 QRegExpEngine::Box::Box( QRegExpEngine *engine )
     : eng( engine ), skipanchors( 0 )
@@ -2443,28 +2449,28 @@ void QRegExpEngine::Box::setupHeuristics()
 #endif
 
 #if defined(QT_DEBUG)
 void QRegExpEngine::Box::dump() const
 {
     int i;
-    qDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" );
-    qDebug( "  Left states:" );
+    odebug << "Box of at least " << minl << " character" << (minl == 1 ? "" : "s") << oendl;
+    odebug << "  Left states:" << oendl;
     for ( i = 0; i < (int) ls.size(); i++ ) {
         if ( at(lanchors, ls[i]) == 0 )
-            qDebug( "    %d", ls[i] );
+        odebug << "    " << ls[i] << oendl;
         else
-            qDebug( "    %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] );
+        odebug << "    " << ls[i] << QString().sprintf(" [anchors 0x%.8x]", lanchors[ls[i]]) << oendl;
     }
-    qDebug( "  Right states:" );
+    odebug << "  Right states:" << oendl;
     for ( i = 0; i < (int) rs.size(); i++ ) {
         if ( at(ranchors, ls[i]) == 0 )
-            qDebug( "    %d", rs[i] );
+        odebug << "    " << rs[i] << oendl;
         else
-            qDebug( "    %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] );
+        odebug << "    " << rs[i] << QString().sprintf(" [anchors 0x%.8x]", ranchors[rs[i]]) << oendl;
     }
-    qDebug( "  Skip anchors: 0x%.8x", skipanchors );
+    odebug << QString().sprintf("  Skip anchors: 0x%.8x", skipanchors) << oendl;
 }
 #endif
 
 void QRegExpEngine::Box::addAnchorsToEngine( const Box& to ) const
 {
     for ( int i = 0; i < (int) to.ls.size(); i++ ) {