qDebug -> odebug

1 files changed, 5 insertions, 4 deletions

diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index 929f370..db5d135 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -17,24 +17,25 @@
  ** not clear to you.
  **
  **********************************************************************/
 
 #include <qfile.h>
 #include <qtl.h>
 #include <math.h>
 #include <limits.h>
 #include <errno.h>
 #include <qdatastream.h>
 #include "qimpencombining.h"
 #include "qimpenchar.h"
+#include "opie2/odebug.h"
 
 #define QIMPEN_MATCH_THRESHOLD	    200000
 
 const QIMPenSpecialKeys qimpen_specialKeys[] = {
 	{ Qt::Key_Escape,		"[Esc]" },
 	{ Qt::Key_Tab,		"[Tab]" },
 	{ Qt::Key_Backspace,	"[BackSpace]" },
 	{ Qt::Key_Return,		"[Return]" },
 	{ QIMPenChar::Caps,		"[Uppercase]" },
 	{ QIMPenChar::CapsLock,	"[Caps Lock]" },
 	{ QIMPenChar::Shortcut,	"[Shortcut]" },
 	{ QIMPenChar::Punctuation,  "[Punctuation]" },
@@ -158,40 +159,40 @@ int QIMPenChar::match( QIMPenChar *pen )
 		QPoint p1 = it1.current()->boundingRect().center() -
 			strokes.getFirst()->boundingRect().center();
 		QPoint p2 = it2.current()->boundingRect().center() -
 			pen->strokes.getFirst()->boundingRect().center();
 		int xdiff = QABS( p1.x() - p2.x() ) - 6;
 		int ydiff = QABS( p1.y() - p2.y() ) - 5;
 		if ( xdiff < 0 )
 			xdiff = 0;
 		if ( ydiff < 0 )
 			ydiff = 0;
 		if ( xdiff > 10 || ydiff > 10 ) { // not a chance
 #ifdef DEBUG_QIMPEN
-			qDebug( "char %c, stroke starting pt diff excessive", pen->ch );
+			odebug << "char " << pen->ch <<", stroke starting pt diff excessive" << oendl;
 #endif
 			return INT_MAX;
 		}
 		diff += xdiff*xdiff + ydiff*ydiff;
 		err = it1.current()->match( it2.current() );
 		if ( err > maxErr )
 			maxErr = err;
 		++it1;
 		++it2;
 	}
 
 	maxErr += diff * diff * 6; // magic weighting :)
 
 #ifdef DEBUG_QIMPEN
-	qDebug( "char: %c, maxErr %d, diff %d, (%d)", pen->ch, maxErr, diff, strokes.count() );
+	odebug << "char: " << pen->ch << ", maxErr " << maxErr << ", diff " << diff << ", "  << strokes.count() << oendl;
 #endif
 	return maxErr;
 }
 
 /*!
   Return the bounding rect of this character.  It may have sides with
   negative coords since its origin is where the user started drawing
   the character.
   */
 QRect QIMPenChar::boundingRect()
 {
 	QRect br;
@@ -449,26 +450,26 @@ QIMPenCharMatchList QIMPenCharSet::match( QIMPenChar *ch )
 					QIMPenCharMatch m;
 					m.error = err;
 					m.penChar = tmplChar;
 					matches.append( m );
 				}
 			}
 		}
 	}
 	qHeapSort( matches );
 	/*
 	   QIMPenCharMatchList::Iterator it;
 	   for ( it = matches.begin(); it != matches.end(); ++it ) {
-	   qDebug( "Match: \'%c\', error %d, strokes %d", (*it).penChar->character(),
-	   (*it).error, (*it).penChar->penStrokes().count() );
+	
+	   odebug << "Match: \'" << (*it).penChar->character() "\', error " << (*it).error ", strokes " <<(*it).penChar->penStrokes().count() << oendl;
 	   }
 	   */
 	return matches;
 }
 
 /*!
   Add a character \a ch to this set.
   QIMPenCharSet will delete this character when it is no longer needed.
   */
 void QIMPenCharSet::addChar( QIMPenChar *ch )
 {
 	if ( ch->penStrokes().count() > maxStrokes )