1 files changed, 18 insertions, 17 deletions

diff --git a/inputmethods/handwriting/qimpenmatch.cpp b/inputmethods/handwriting/qimpenmatch.cpp
index 0d3e25a..a0448b6 100644
--- a/inputmethods/handwriting/qimpenmatch.cpp
+++ b/inputmethods/handwriting/qimpenmatch.cpp
@@ -26,4 +26,5 @@
 #include <qapplication.h>
 #include <qtimer.h>
+#include <opie2/odebug.h>
 
 #include <limits.h>
@@ -69,5 +70,5 @@ void QIMPenMatch::strokeEntered( QIMPenStroke *st )
 {
 #ifdef DEBUG_QIMPEN
-    qDebug( "---------- new stroke -------------" );
+    odebug << "---------- new stroke -------------" << oendl;
 #endif
     strokes.append( new QIMPenStroke( *st ) );
@@ -82,10 +83,10 @@ void QIMPenMatch::strokeEntered( QIMPenStroke *st )
     if ( strokes.count() > 1 && multiCharSet ) {
 #ifdef DEBUG_QIMPEN
-        qDebug( "Matching against multi set" );
+        odebug << "Matching against multi set" << oendl;
 #endif
         ml = multiCharSet->match( &testChar );
     } else {
 #ifdef DEBUG_QIMPEN
-        qDebug( "Matching against single set" );
+        odebug << "Matching against single set" << oendl;
 #endif
         ml = charSet->match( &testChar );
@@ -98,5 +99,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 {
 #ifdef DEBUG_QIMPEN
-    qDebug( "Entering strokes.count() = %d", strokes.count() );
+    odebug << "Entering strokes.count() = " <<  strokes.count() << oendl;
 #endif
     QIMPenCharMatch candidate1 = { INT_MAX, 0 };
@@ -108,5 +109,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
         candidate1 = ml.first();
 #ifdef DEBUG_QIMPEN
-        qDebug( QString("Candidate1 = %1").arg(QChar(candidate1.penChar->character())) );
+        odebug << "Candidate1 = " << candidate1.penChar->character() << oendl;
 #endif
     }
@@ -121,5 +122,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
             candidate2 = ml2.first();
 #ifdef DEBUG_QIMPEN
-            qDebug( QString("Candidate2 = %1").arg(QChar(candidate2.penChar->character())) );
+            odebug << "Candidate2 = " << candidate2.penChar->character() << oendl;
 #endif
         }
@@ -143,5 +144,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
             ml = ml2;
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Using Candidate2" );
+            odebug << "** Using Candidate2" << oendl;
 #endif
         } else {
@@ -152,5 +153,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
             prevMatchError = candidate1.error;
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Using Candidate1, with erase" );
+            odebug << "** Using Candidate1, with erase" << oendl;
 #endif
         }
@@ -163,5 +164,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
         prevMatchError = candidate1.error;
 #ifdef DEBUG_QIMPEN
-        qDebug( "** Using Candidate1" );
+        odebug << "** Using Candidate1" << oendl;
 #endif
     } else if ( candidate2.penChar ) {
@@ -176,15 +177,15 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
         ml = ml2;
 #ifdef DEBUG_QIMPEN
-        qDebug( "** Using Candidate2" );
+        odebug << "** Using Candidate2" << oendl;
 #endif
     } else {
         if ( !ml.count() ) {
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Failed" );
+            odebug << "** Failed" << oendl; 
 #endif
             canErase = FALSE;
         } else {
 #ifdef DEBUG_QIMPEN
-            qDebug( "Need more strokes" );
+            odebug << "Need more strokes" << oendl;
 #endif
             if ( strokes.count() == 1 )
@@ -198,5 +199,5 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
     if ( eraseLast && canErase ) {
 #ifdef DEBUG_QIMPEN
-        qDebug( "deleting last" );
+        odebug << "deleting last" << oendl;
 #endif
         emit erase();
@@ -229,10 +230,10 @@ void QIMPenMatch::updateWordMatch( QIMPenCharMatchList &ml )
          code == Qt::Key_Enter || code == Qt::Key_Return ||
          code == Qt::Key_Tab || code == Qt::Key_Escape ) {
-        //qDebug( "Word Matching: Clearing word" );
+        //odebug << "Word Matching: Clearing word" << oendl;
         wordChars.clear();
         wordMatches.clear();
         wordEntered = QString();
     } else if ( code == Qt::Key_Backspace ) {
-        //qDebug( "Word Matching: Handle backspace" );
+        //odebug << "Word Matching: Handle backspace" << oendl;
         wordChars.removeLast();
         wordEntered.truncate( wordEntered.length() - 1 );
@@ -282,9 +283,9 @@ void QIMPenMatch::matchWords()
         QListIterator<MatchWord> it( wordMatches);
         for ( ; it.current(); ++it ) {
-            qDebug( QString("Match word: %1").arg(it.current()->word) );
+            odebug << "Match word: " << it.current()->word << oendl;
         }
 */
     }
-    //qDebug( "Possibles: Good %d, total %d", goodMatches, wordMatches.count() );
+    //odebug << "Possibles: Good " << goodMatches << ", total " << wordMatches.count() << oendl;
     wordMatches.sort();
 }