author | ar <ar> | 2004-05-27 22:04:46 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-27 22:04:46 (UTC) |
commit | 4f7c3c4d0d634706d13950b3827714b168e279e3 (patch) (unidiff) | |
tree | 2df448e7a4dcd538c26365873e194be2b55e83b7 | |
parent | 46f81a089ba8febdb79e0d150b69f74bb1ea7d18 (diff) | |
download | opie-4f7c3c4d0d634706d13950b3827714b168e279e3.zip opie-4f7c3c4d0d634706d13950b3827714b168e279e3.tar.gz opie-4f7c3c4d0d634706d13950b3827714b168e279e3.tar.bz2 |
- convert qDebug to odebug
-rw-r--r-- | noncore/apps/keyz-cfg/zkb.cpp | 26 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/opie-reader/BuffDoc.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CEncoding.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CExpander.h | 0 | ||||
-rw-r--r-- | noncore/apps/opie-reader/Filedata.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/FontControl.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/Palm2QImage.cpp | 55 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReader.h | 12 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.h | 4 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/document/katedocument.h | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp | 80 |
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,3 +1,7 @@ | |||
1 | #include "zkb.h" | 1 | #include "zkb.h" |
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | |||
2 | #include <stdio.h> | 6 | #include <stdio.h> |
3 | 7 | ||
@@ -253,6 +257,6 @@ bool Keymap::filter(int unicode, int keycode, int modifiers, | |||
253 | bool isPress, bool autoRepeat) { | 257 | bool isPress, bool autoRepeat) { |
254 | 258 | ||
255 | qDebug("filter: >>> unicode=%x, keycode=%x, modifiers=%x, " | 259 | odebug << "filter: >>> unicode=" << unicode << ", keycode=" << keycode |
256 | "ispressed=%x\n", unicode, keycode, modifiers, isPress); | 260 | << ", modifiers=" << modifiers << ", ispressed=" << isPress << oendl; |
257 | 261 | ||
258 | if (!enabled) { | 262 | if (!enabled) { |
@@ -276,8 +280,6 @@ bool Keymap::filter(int unicode, int keycode, int modifiers, | |||
276 | 280 | ||
277 | if (action->hasEvent()) { | 281 | if (action->hasEvent()) { |
278 | qDebug("filter:<<< unicode=%x, keycode=%x, modifiers=%x, " | 282 | odebug << "filter:<<< unicode=" << action->getUnicode() << ", keycode=" << action->getKeycode() |
279 | "ispressed=%x\n", action->getUnicode(), | 283 | << ", modifiers=" << action->getModifiers() << ", ispressed=" << action->isPressed() << oendl; |
280 | action->getKeycode(), action->getModifiers(), | ||
281 | action->isPressed()); | ||
282 | 284 | ||
283 | QWSServer::sendKeyEvent(action->getUnicode(), | 285 | QWSServer::sendKeyEvent(action->getUnicode(), |
@@ -405,6 +407,5 @@ bool Keymap::setCurrentState(State* state) { | |||
405 | currentStateName = it.key(); | 407 | currentStateName = it.key(); |
406 | 408 | ||
407 | qDebug("state changed: %s\n", (const char*) | 409 | odebug << "state changed: " << (const char*)currentStateName.utf8() << oendl; |
408 | currentStateName.utf8()); | ||
409 | 410 | ||
410 | if (!lsmapInSync) { | 411 | if (!lsmapInSync) { |
@@ -464,9 +465,8 @@ bool Keymap::removeState(const QString& name, bool force) { | |||
464 | void Keymap::autoRepeat() { | 465 | void Keymap::autoRepeat() { |
465 | if (autoRepeatAction != 0) { | 466 | if (autoRepeatAction != 0) { |
466 | qDebug("filter:<<< unicode=%x, keycode=%x, modifiers=%x, " | 467 | odebug << "filter:<<< unicode=" << autoRepeatAction->getUnicode() |
467 | "ispressed=%x\n", autoRepeatAction->getUnicode(), | 468 | << ", keycode=" << autoRepeatAction->getKeycode() |
468 | autoRepeatAction->getKeycode(), | 469 | << ", modifiers=" << autoRepeatAction->getModifiers() |
469 | autoRepeatAction->getModifiers(), | 470 | << "ispressed=" << autoRepeatAction->isPressed() << oendl; |
470 | autoRepeatAction->isPressed()); | ||
471 | 471 | ||
472 | QWSServer::sendKeyEvent(autoRepeatAction->getUnicode(), | 472 | QWSServer::sendKeyEvent(autoRepeatAction->getUnicode(), |
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 | |||
@@ -422,6 +422,7 @@ void Gutenbrowser::ForwardBtn() { | |||
422 | 422 | ||
423 | pageStopArray[i_pageNum ] = currentFilePos; | 423 | pageStopArray[i_pageNum ] = currentFilePos; |
424 | // qDebug("%d current page is number %d, pagesize %d, length %d, current %d", | 424 | // odebug << currentFilePos << " current page is number " << i_pageNum |
425 | // currentFilePos, i_pageNum, pageSize, Lview->length(), pageStopArray[i_pageNum] ); | 425 | // << ", pagesize " << pageSize << ", length " << Lview->length() |
426 | // << ", current " << pageStopArray[i_pageNum] << oendl; | ||
426 | setStatus(); | 427 | setStatus(); |
427 | Lview->setCursorPosition( 0, 0, FALSE); | 428 | Lview->setCursorPosition( 0, 0, FALSE); |
@@ -456,6 +457,7 @@ void Gutenbrowser::BackBtn() { | |||
456 | currentFilePos = f.at(); | 457 | currentFilePos = f.at(); |
457 | 458 | ||
458 | // qDebug("%d move back to %d, current page number %d, %d, length %d", | 459 | // odebug << currentFilePos << " move back to " << pageStopArray[i_pageNum - 1 ] |
459 | // currentFilePos, pageStopArray[i_pageNum - 1 ], i_pageNum, pageSize, Lview->length() ); | 460 | // << ", current page number " << i_pageNum |
461 | // << ", " << pageSize << ", length " << Lview->length() << oendl; | ||
460 | 462 | ||
461 | if( i_pageNum < 2) { | 463 | if( i_pageNum < 2) { |
@@ -800,6 +802,7 @@ bool Gutenbrowser::load( const char *fileName) { | |||
800 | pageStopArray[1] = currentFilePos; | 802 | pageStopArray[1] = currentFilePos; |
801 | 803 | ||
802 | qDebug("<<<<<<<<<<<%d current page is number %d, length %d, current %d, pageSize %d", | 804 | odebug << "<<<<<<<<<<<" << currentFilePos << " current page is number " << i_pageNum |
803 | currentFilePos, i_pageNum, Lview->length(), pageStopArray[i_pageNum], Lview->PageSize() ); | 805 | << ", length " << Lview->length() << ", current " << pageStopArray[i_pageNum] |
806 | << ", pageSize " << Lview->PageSize() << oendl; | ||
804 | 807 | ||
805 | Lview->setMaxLines(Lview->PageSize()*2); | 808 | Lview->setMaxLines(Lview->PageSize()*2); |
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 | |||
@@ -57,5 +57,5 @@ class BuffDoc | |||
57 | filt = NULL; | 57 | filt = NULL; |
58 | lastword.empty(); | 58 | lastword.empty(); |
59 | // // qDebug("Buffdoc created"); | 59 | // odebug << "Buffdoc created" << oendl; |
60 | } | 60 | } |
61 | bool empty() { return (exp == NULL); } | 61 | bool empty() { return (exp == NULL); } |
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 | |||
@@ -62,6 +62,6 @@ class CGeneral8Bit : public CEncoding | |||
62 | CGeneral8Bit(int _i) : m_index(_i) | 62 | CGeneral8Bit(int _i) : m_index(_i) |
63 | { | 63 | { |
64 | // qDebug("8Bit:%d", _i); | 64 | // odebug << "8Bit: " << _i << oendl; |
65 | // qDebug("%s", unicodetable::iterator(_i)->mime); | 65 | // odebug << unicodetable::iterator(_i)->mime << oendl; |
66 | } | 66 | } |
67 | void getch(tchar& ch, CStyle& sty) | 67 | void getch(tchar& ch, CStyle& sty) |
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 | |||
@@ -27,9 +27,9 @@ class CFiledata | |||
27 | { | 27 | { |
28 | delete [] data; | 28 | delete [] data; |
29 | // qDebug("~Filedata: deleting"); | 29 | // odebug << "~Filedata: deleting" << oendl; |
30 | } | 30 | } |
31 | else | 31 | else |
32 | { | 32 | { |
33 | // qDebug("~Filedata: not deleting"); | 33 | // odebug << "~Filedata: not deleting" << oendl; |
34 | } | 34 | } |
35 | } | 35 | } |
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 | |||
@@ -105,5 +105,5 @@ class FontControl | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | // qDebug("Font:%d Graphics:%d", m_size, g_size); | 107 | // odebug << "Font:" << m_size << " Graphics:" << g_size << oendl; |
108 | return true; | 108 | return true; |
109 | } | 109 | } |
@@ -125,5 +125,5 @@ class FontControl | |||
125 | } | 125 | } |
126 | } | 126 | } |
127 | // qDebug("Font:%d Graphics:%d", m_size, g_size); | 127 | // odebug << "Font:" << m_size << " Graphics:" << g_size << oendl; |
128 | return true; | 128 | return true; |
129 | } | 129 | } |
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,3 +1,11 @@ | |||
1 | /* -*- mode: c; indent-tabs-mode: nil; -*- */ | 1 | /* -*- mode: c; indent-tabs-mode: nil; -*- */ |
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | |||
6 | /* QT */ | ||
7 | #include <qimage.h> | ||
8 | |||
9 | /* STD */ | ||
2 | #include <stdio.h> | 10 | #include <stdio.h> |
3 | #include <stdlib.h> | 11 | #include <stdlib.h> |
@@ -10,5 +18,4 @@ | |||
10 | #include <stdarg.h> | 18 | #include <stdarg.h> |
11 | 19 | ||
12 | #include <qimage.h> | ||
13 | 20 | ||
14 | /***********************************************************************/ | 21 | /***********************************************************************/ |
@@ -142,14 +149,16 @@ QImage* Palm2QImage | |||
142 | 149 | ||
143 | #if 0 | 150 | #if 0 |
144 | // qDebug ("Palm image is %dx%d, %d bpp, version %d, flags 0x%x, compression %d", width, height, bits_per_pixel, version, flags, compression_type); | 151 | // odebug << "Palm image is " << width << "x" << height |
152 | // << ", " << bits_per_pixel << " bpp, version " << version | ||
153 | // << ", flags 0x" << flags << ", compression " << compression_type << oendl; | ||
145 | #endif | 154 | #endif |
146 | 155 | ||
147 | if (compression_type == PALM_COMPRESSION_PACKBITS) { | 156 | if (compression_type == PALM_COMPRESSION_PACKBITS) { |
148 | // qDebug ("Image uses packbits compression; not yet supported"); | 157 | // odebug << "Image uses packbits compression; not yet supported" << oendl; |
149 | return NULL; | 158 | return NULL; |
150 | } else if ((compression_type != PALM_COMPRESSION_NONE) && | 159 | } else if ((compression_type != PALM_COMPRESSION_NONE) && |
151 | (compression_type != PALM_COMPRESSION_RLE) && | 160 | (compression_type != PALM_COMPRESSION_RLE) && |
152 | (compression_type != PALM_COMPRESSION_SCANLINE)) { | 161 | (compression_type != PALM_COMPRESSION_SCANLINE)) { |
153 | // qDebug ("Image uses unknown compression, code 0x%x", compression_type); | 162 | // odebug << "Image uses unknown compression, code 0x" << compression_type << oendl; |
154 | return NULL; | 163 | return NULL; |
155 | } | 164 | } |
@@ -169,5 +178,5 @@ QImage* Palm2QImage | |||
169 | 178 | ||
170 | if (flags & PALM_HAS_COLORMAP_FLAG) { | 179 | if (flags & PALM_HAS_COLORMAP_FLAG) { |
171 | // qDebug("Palm images with custom colormaps are not currently supported.\n"); | 180 | // odebug << "Palm images with custom colormaps are not currently supported." << oendl; |
172 | return NULL; | 181 | return NULL; |
173 | } else if (bits_per_pixel == 1) { | 182 | } else if (bits_per_pixel == 1) { |
@@ -188,16 +197,18 @@ QImage* Palm2QImage | |||
188 | palm_green_bits = palmimage[17]; | 197 | palm_green_bits = palmimage[17]; |
189 | palm_blue_bits = palmimage[18]; | 198 | palm_blue_bits = palmimage[18]; |
190 | // qDebug("Bits:%d, %d, %d", palm_red_bits, palm_green_bits, palm_blue_bits); | 199 | // odebug << "Bits:" << palm_red_bits << ", " << palm_green_bits << ", " << palm_blue_bits << oendl; |
191 | if (palm_blue_bits > 8 || palm_green_bits > 8 || palm_red_bits > 8) { | 200 | if (palm_blue_bits > 8 || palm_green_bits > 8 || palm_red_bits > 8) { |
192 | // 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); | 201 | // odebug << "Can't handle this format DirectColor image -- too wide in some color (" |
202 | // << palm_red_bits << ":" << palm_green_bits << ":" << palm_blue_bits << oendl; | ||
193 | return NULL; | 203 | return NULL; |
194 | } | 204 | } |
195 | if (bits_per_pixel > (8 * sizeof(unsigned long))) { | 205 | if (bits_per_pixel > (8 * sizeof(unsigned long))) { |
196 | // qDebug ("Can't handle this format DirectColor image -- too many bits per pixel (%d)\n", bits_per_pixel); | 206 | // odebug << "Can't handle this format DirectColor image -- too many bits per pixel (" |
207 | // << bits_per_pixel << ")" << oendl; | ||
197 | return NULL; | 208 | return NULL; |
198 | } | 209 | } |
199 | imagedatastart = palmimage + 24; | 210 | imagedatastart = palmimage + 24; |
200 | } else { | 211 | } else { |
201 | // qDebug("Unknown bits-per-pixel of %d encountered.\n", bits_per_pixel); | 212 | // odebug << "Unknown bits-per-pixel of " << bits_per_pixel << " encountered" << oendl; |
202 | return NULL; | 213 | return NULL; |
203 | } | 214 | } |
@@ -214,5 +225,6 @@ QImage* Palm2QImage | |||
214 | 225 | ||
215 | for (i=0, palm_ptr = imagedatastart , x_ptr = imagedata; i < height; ++i) { | 226 | for (i=0, palm_ptr = imagedatastart , x_ptr = imagedata; i < height; ++i) { |
216 | // qDebug("inval:%x palm_ptr:%x x_ptr:%x bpr:%x", inval, palm_ptr, x_ptr, bytes_per_row); | 227 | // odebug << "inval:" << inval << " palm_ptr:" << palm_ptr << " x_ptr:" << x_ptr |
228 | // << " bpr:" << bytes_per_row << oendl; | ||
217 | 229 | ||
218 | /* first, uncompress the Palm image */ | 230 | /* first, uncompress the Palm image */ |
@@ -244,10 +256,10 @@ QImage* Palm2QImage | |||
244 | } | 256 | } |
245 | else { | 257 | else { |
246 | qDebug("Case 4"); | 258 | odebug << "Case 4" << oendl; |
247 | qDebug("Is compressed:%s", ((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true"); | 259 | odebug << "Is compressed:" << (((flags & PALM_IS_COMPRESSED_FLAG) == 0) ? "false" : "true") << oendl; |
248 | qDebug("Has colourmap:%s", ((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true"); | 260 | odebug << "Has colourmap:" << (((flags & PALM_HAS_COLORMAP_FLAG) == 0) ? "false" : "true") << oendl; |
249 | qDebug("Has transparency:%s", ((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true"); | 261 | odebug << "Has transparency:" << (((flags & PALM_HAS_TRANSPARENCY_FLAG) == 0) ? "false" : "true") << oendl; |
250 | qDebug("Direct colour:%s", ((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true"); | 262 | odebug << "Direct colour:" << (((flags & PALM_DIRECT_COLOR_FLAG) == 0) ? "false" : "true") << oendl; |
251 | qDebug("four byte field:%s", ((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true"); | 263 | odebug << "four byte field:" << (((flags & PALM_4_BYTE_FIELD_FLAG) == 0) ? "false" : "true") << oendl; |
252 | memcpy (rowbuf, palm_ptr, bytes_per_row); | 264 | memcpy (rowbuf, palm_ptr, bytes_per_row); |
253 | palm_ptr += bytes_per_row; | 265 | palm_ptr += bytes_per_row; |
@@ -276,9 +288,8 @@ QImage* Palm2QImage | |||
276 | 288 | ||
277 | /* | 289 | /* |
278 | qDebug ("pixel is %d,%d (%d:%d:%d)", | 290 | odebug << "pixel is " << j << "," << i << " (" |
279 | j, i, | 291 | << (((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits)) << ":" |
280 | ((inval >> (bits_per_pixel - palm_red_bits)) & ((1 << palm_red_bits) - 1)) << (8-palm_red_bits), | 292 | << (((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits)) << ":" |
281 | ((inval >> palm_blue_bits) & ((1 << palm_green_bits) - 1)) << (8-palm_green_bits), | 293 | << (((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits)) << ")" << oendl; |
282 | ((inval >> 0) & ((1 << palm_blue_bits) - 1)) << (8-palm_blue_bits)); | ||
283 | */ | 294 | */ |
284 | QRgb colour = qRgb( | 295 | QRgb colour = qRgb( |
@@ -300,5 +311,5 @@ QImage* Palm2QImage | |||
300 | QImage* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b) | 311 | QImage* hRule(int w, int h, unsigned char r, unsigned char g, unsigned char b) |
301 | { | 312 | { |
302 | //// qDebug("hrule [%d, %d]", w, h); | 313 | // odebug << "hrule [" << w << ", " << h << "]" << oendl; |
303 | QPixmap* qimage = new QPixmap(w, h); | 314 | QPixmap* qimage = new QPixmap(w, h); |
304 | qimage->fill(QColor(r,g,b)); | 315 | qimage->fill(QColor(r,g,b)); |
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 | |||
@@ -137,21 +137,21 @@ public: | |||
137 | CEncoding* getencoding() | 137 | CEncoding* getencoding() |
138 | { | 138 | { |
139 | // qDebug("m_encd:%d", m_encd); | 139 | // odebug << "m_encd:" << m_encd << oendl; |
140 | switch (m_encd) | 140 | switch (m_encd) |
141 | { | 141 | { |
142 | case 4: | 142 | case 4: |
143 | // qDebug("palm"); | 143 | // odebug << "palm" << oendl; |
144 | return new CPalm; | 144 | return new CPalm; |
145 | case 1: | 145 | case 1: |
146 | // qDebug("utf8"); | 146 | // odebug << "utf8" << oendl; |
147 | return new CUtf8; | 147 | return new CUtf8; |
148 | case 2: | 148 | case 2: |
149 | // qDebug("ucs16be"); | 149 | // odebug << "ucs16be" << oendl; |
150 | return new CUcs16be; | 150 | return new CUcs16be; |
151 | case 3: | 151 | case 3: |
152 | // qDebug("ucs16le"); | 152 | // odebug << "ucs16le" << oendl; |
153 | return new CUcs16le; | 153 | return new CUcs16le; |
154 | case 0: | 154 | case 0: |
155 | // qDebug("ascii"); | 155 | // odebug << "ascii" << oendl; |
156 | return new CAscii; | 156 | return new CAscii; |
157 | default: | 157 | default: |
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 | |||
@@ -400,6 +400,6 @@ private slots: | |||
400 | void resizeEvent( QResizeEvent * r) | 400 | void resizeEvent( QResizeEvent * r) |
401 | { | 401 | { |
402 | // qDebug("resize:(%u,%u)", r->oldSize().width(), r->oldSize().height()); | 402 | // odebug << "resize:(" << r->oldSize().width() << "," << r->oldSize().height() << ")" << oendl; |
403 | // qDebug("resize:(%u,%u)", r->size().width(), r->size().height()); | 403 | // odebug << "resize:(" << r->size().width() << "," << r->size().height() << ")" << oendl; |
404 | // bgroup->move( width()-bgroup->width(), 0 ); | 404 | // bgroup->move( width()-bgroup->width(), 0 ); |
405 | } | 405 | } |
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 | |||
@@ -77,5 +77,5 @@ public: | |||
77 | short *wa=warray[row]; | 77 | short *wa=warray[row]; |
78 | if (!wa) { | 78 | if (!wa) { |
79 | // qDebug("create row: %d",row); | 79 | // odebug << "create row: " << row << oendl; |
80 | wa=warray[row]=new short[256]; | 80 | wa=warray[row]=new short[256]; |
81 | for (int i=0; i<256; i++) wa[i]=-1; | 81 | for (int i=0; i<256; i++) wa[i]=-1; |
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 | |||
@@ -39,9 +39,4 @@ | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #include "qarray.h" | ||
42 | #include "qbitarray.h" | ||
43 | #include "qcache.h" | ||
44 | #include "qintdict.h" | ||
45 | #include "qmap.h" | ||
46 | #if QT_VERSION < 300 | 41 | #if QT_VERSION < 300 |
47 | #include "./qregexp3.h" | 42 | #include "./qregexp3.h" |
@@ -49,8 +44,19 @@ | |||
49 | #include "qregexp.h" | 44 | #include "qregexp.h" |
50 | #endif | 45 | #endif |
51 | #include "qstring.h" | ||
52 | #include "qtl.h" | ||
53 | #include "qvector.h" | ||
54 | 46 | ||
47 | /* OPIE */ | ||
48 | #include <opie2/odebug.h> | ||
49 | |||
50 | /* QT */ | ||
51 | #include <qarray.h> | ||
52 | #include <qbitarray.h> | ||
53 | #include <qcache.h> | ||
54 | #include <qintdict.h> | ||
55 | #include <qmap.h> | ||
56 | #include <qstring.h> | ||
57 | #include <qtl.h> | ||
58 | #include <qvector.h> | ||
59 | |||
60 | /* STD */ | ||
55 | #include <limits.h> | 61 | #include <limits.h> |
56 | 62 | ||
@@ -1432,48 +1438,48 @@ void QRegExpEngine::dump() const | |||
1432 | { | 1438 | { |
1433 | int i, j; | 1439 | int i, j; |
1434 | qDebug( "Case %ssensitive engine", cs ? "" : "in" ); | 1440 | odebug << "Case " << (cs ? "" : "in") << "sensitive engine" << oendl; |
1435 | qDebug( " States" ); | 1441 | odebug << " States" << oendl; |
1436 | for ( i = 0; i < ns; i++ ) { | 1442 | for ( i = 0; i < ns; i++ ) { |
1437 | qDebug( " %d%s", i, | 1443 | odebug << " " << i |
1438 | i == InitialState ? " (initial)" : | 1444 | << (i == InitialState ? " (initial)" : i == FinalState ? " (final)" : "") << oendl; |
1439 | i == FinalState ? " (final)" : "" ); | 1445 | |
1440 | #ifndef QT_NO_REGEXP_CAPTURE | 1446 | #ifndef QT_NO_REGEXP_CAPTURE |
1441 | qDebug( " in atom %d", s[i]->atom ); | 1447 | odebug << " in atom " << s[i]->atom << oendl; |
1442 | #endif | 1448 | #endif |
1443 | int m = s[i]->match; | 1449 | int m = s[i]->match; |
1444 | if ( (m & CharClassBit) != 0 ) { | 1450 | if ( (m & CharClassBit) != 0 ) { |
1445 | qDebug( " match character class %d", m ^ CharClassBit ); | 1451 | odebug << " match character class " << (m ^ CharClassBit) << oendl; |
1446 | #ifndef QT_NO_REGEXP_CCLASS | 1452 | #ifndef QT_NO_REGEXP_CCLASS |
1447 | cl[m ^ CharClassBit]->dump(); | 1453 | cl[m ^ CharClassBit]->dump(); |
1448 | #else | 1454 | #else |
1449 | qDebug( " negative character class" ); | 1455 | odebug << " negative character class" << oendl; |
1450 | #endif | 1456 | #endif |
1451 | } else if ( (m & BackRefBit) != 0 ) { | 1457 | } else if ( (m & BackRefBit) != 0 ) { |
1452 | qDebug( " match back-reference %d", m ^ BackRefBit ); | 1458 | odebug << " match back-reference " << (m ^ BackRefBit) << oendl; |
1453 | } else if ( m >= 0x20 && m <= 0x7e ) { | 1459 | } else if ( m >= 0x20 && m <= 0x7e ) { |
1454 | qDebug( " match 0x%.4x (%c)", m, m ); | 1460 | odebug << " match " << QString().sprintf( "0x%.4x", m) << " (" << m << ")" << oendl; |
1461 | |||
1455 | } else { | 1462 | } else { |
1456 | qDebug( " match 0x%.4x", m ); | 1463 | odebug << " match " << QString().sprintf( "0x%.4x", m) << oendl; |
1457 | } | 1464 | } |
1458 | for ( j = 0; j < (int) s[i]->outs.size(); j++ ) { | 1465 | for ( j = 0; j < (int) s[i]->outs.size(); j++ ) { |
1459 | int next = s[i]->outs[j]; | 1466 | int next = s[i]->outs[j]; |
1460 | qDebug( " -> %d", next ); | 1467 | odebug << " -> " << next << oendl; |
1461 | if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) ) | 1468 | if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) ) |
1462 | qDebug( " [reenter %d]", (*s[i]->reenter)[next] ); | 1469 | odebug << " [reenter " << (*s[i]->reenter)[next] << "]" << oendl; |
1463 | if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 ) | 1470 | if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 ) |
1464 | qDebug( " [anchors 0x%.8x]", (*s[i]->anchors)[next] ); | 1471 | odebug << " [anchors " << QString().sprintf( "0x%.8x]", (*s[i]->anchors)[next] ) << oendl; |
1465 | } | 1472 | } |
1466 | } | 1473 | } |
1467 | #ifndef QT_NO_REGEXP_CAPTURE | 1474 | #ifndef QT_NO_REGEXP_CAPTURE |
1468 | if ( nf > 0 ) { | 1475 | if ( nf > 0 ) { |
1469 | qDebug( " Atom Parent Capture" ); | 1476 | odebug << " Atom Parent Capture" << oendl; |
1470 | for ( i = 0; i < nf; i++ ) | 1477 | for ( i = 0; i < nf; i++ ) |
1471 | qDebug( " %6d %6d %6d", i, f[i].parent, f[i].capture ); | 1478 | odebug << QString().sprintf(" %6d %6d %6d", i, f[i].parent, f[i].capture ) << oendl; |
1472 | } | 1479 | } |
1473 | #endif | 1480 | #endif |
1474 | #ifndef QT_NO_REGEXP_ANCHOR_ALT | 1481 | #ifndef QT_NO_REGEXP_ANCHOR_ALT |
1475 | for ( i = 0; i < (int) aa.size(); i++ ) | 1482 | for ( i = 0; i < (int) aa.size(); i++ ) |
1476 | qDebug( " Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, | 1483 | odebug << QString().sprintf(" Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, aa[i].b ) << oendl; |
1477 | aa[i].b ); | ||
1478 | #endif | 1484 | #endif |
1479 | } | 1485 | } |
@@ -2197,11 +2203,11 @@ void QRegExpEngine::CharClass::dump() const | |||
2197 | { | 2203 | { |
2198 | int i; | 2204 | int i; |
2199 | qDebug( " %stive character class", n ? "nega" : "posi" ); | 2205 | odebug << " " << (n ? "nega" : "posi") << "tive character class" << oendl; |
2200 | #ifndef QT_NO_REGEXP_CCLASS | 2206 | #ifndef QT_NO_REGEXP_CCLASS |
2201 | if ( c != 0 ) | 2207 | if ( c != 0 ) |
2202 | qDebug( " categories 0x%.8x", c ); | 2208 | odebug << QString().sprintf(" categories 0x%.8x", c ) << oendl; |
2203 | #endif | 2209 | #endif |
2204 | for ( i = 0; i < (int) r.size(); i++ ) | 2210 | for ( i = 0; i < (int) r.size(); i++ ) |
2205 | qDebug( " 0x%.4x through 0x%.4x", r[i].from, r[i].to ); | 2211 | odebug << QString().sprintf(" 0x%.4x through 0x%.4x", r[i].from, r[i].to ) << oendl; |
2206 | } | 2212 | } |
2207 | #endif | 2213 | #endif |
@@ -2447,20 +2453,20 @@ void QRegExpEngine::Box::dump() const | |||
2447 | { | 2453 | { |
2448 | int i; | 2454 | int i; |
2449 | qDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" ); | 2455 | odebug << "Box of at least " << minl << " character" << (minl == 1 ? "" : "s") << oendl; |
2450 | qDebug( " Left states:" ); | 2456 | odebug << " Left states:" << oendl; |
2451 | for ( i = 0; i < (int) ls.size(); i++ ) { | 2457 | for ( i = 0; i < (int) ls.size(); i++ ) { |
2452 | if ( at(lanchors, ls[i]) == 0 ) | 2458 | if ( at(lanchors, ls[i]) == 0 ) |
2453 | qDebug( " %d", ls[i] ); | 2459 | odebug << " " << ls[i] << oendl; |
2454 | else | 2460 | else |
2455 | qDebug( " %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] ); | 2461 | odebug << " " << ls[i] << QString().sprintf(" [anchors 0x%.8x]", lanchors[ls[i]]) << oendl; |
2456 | } | 2462 | } |
2457 | qDebug( " Right states:" ); | 2463 | odebug << " Right states:" << oendl; |
2458 | for ( i = 0; i < (int) rs.size(); i++ ) { | 2464 | for ( i = 0; i < (int) rs.size(); i++ ) { |
2459 | if ( at(ranchors, ls[i]) == 0 ) | 2465 | if ( at(ranchors, ls[i]) == 0 ) |
2460 | qDebug( " %d", rs[i] ); | 2466 | odebug << " " << rs[i] << oendl; |
2461 | else | 2467 | else |
2462 | qDebug( " %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] ); | 2468 | odebug << " " << rs[i] << QString().sprintf(" [anchors 0x%.8x]", ranchors[rs[i]]) << oendl; |
2463 | } | 2469 | } |
2464 | qDebug( " Skip anchors: 0x%.8x", skipanchors ); | 2470 | odebug << QString().sprintf(" Skip anchors: 0x%.8x", skipanchors) << oendl; |
2465 | } | 2471 | } |
2466 | #endif | 2472 | #endif |