5 files changed, 45 insertions, 40 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
@@ -28,2 +28,3 @@
 #include "qimpenchar.h"
+#include "opie2/odebug.h"
 
@@ -169,3 +170,3 @@ int QIMPenChar::match( QIMPenChar *pen )
 #ifdef DEBUG_QIMPEN
-                        qDebug( "char %c, stroke starting pt diff excessive", pen->ch );
+                        odebug << "char " << pen->ch <<", stroke starting pt diff excessive" << oendl;
 #endif
@@ -184,3 +185,3 @@ int QIMPenChar::match( QIMPenChar *pen )
 #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
@@ -460,4 +461,4 @@ QIMPenCharMatchList QIMPenCharSet::match( QIMPenChar *ch )
            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;
            }
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp
index d073cdf..6ea1bb4 100644
--- a/inputmethods/handwriting/qimpeninput.cpp
+++ b/inputmethods/handwriting/qimpeninput.cpp
@@ -38,2 +38,3 @@
 #include <qdir.h>
+#include <opie2/odebug.h>
 
@@ -321,3 +322,3 @@ void QIMPenInput::selectCharSet( int idx )
     if ( mode == Switch ) {
-        //qDebug( "Switch back to normal" );
+        //odebug << "Switch back to normal" << oendl;
         pw->changeCharSet( baseSets.at(currCharSet), currCharSet );
@@ -355,5 +356,6 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
             if ( profile->style() == QIMPenProfile::ToggleCases ) {
-        //      qDebug( "Caps" );
+        //      odebug << "Caps" << oendl;
+        //      
                 if ( mode == SwitchLock ) {
-        //          qDebug( "Switch to normal" );
+        //          odebug << "Switch to normal" << oendl;
                     pw->changeCharSet( profile->lowercase(), currCharSet );
@@ -361,3 +363,3 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
                 } else {
-        //          qDebug( "Switch to upper" );
+        //          odebug << "Switch to upper" << oendl;
                     pw->changeCharSet( profile->uppercase(), currCharSet );
@@ -369,6 +371,6 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
             if ( profile->style() == QIMPenProfile::ToggleCases ) {
-        //      qDebug( "CapsLock" );
+        //      odebug << "CapsLock" << oendl;
                 if ( mode == Switch &&
                      baseSets.at(currCharSet) == profile->uppercase() ) {
-        //          qDebug( "Switch to normal" );
+        //          odebug << "Switch to normal" << oendl;
                     pw->changeCharSet( profile->lowercase(), currCharSet );
@@ -379,3 +381,3 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
                         } else {        
-        //          qDebug( "Switch to caps lock" );
+        //          odebug << "Switch to caps lock" << oendl;
                     pw->changeCharSet( profile->uppercase(), currCharSet );
@@ -390,3 +392,3 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
             if ( profile->punctuation() ) {
-                //qDebug( "Switch to punctuation" );
+                //odebug << "Switch to punctuation" << oendl;
                 pw->changeCharSet( profile->punctuation(), currCharSet );
@@ -397,3 +399,3 @@ void QIMPenInput::matchedCharacters( const QIMPenCharMatchList &cl )
             if ( profile->symbol() ) {
-                //qDebug( "Switch to symbol" );
+                //odebug << "Switch to symbol" << oendl ;
                 pw->changeCharSet( profile->symbol(), currCharSet );
@@ -445,3 +447,3 @@ void QIMPenInput::keypress( uint scan_uni )
     if ( mode == Switch ) {
-        //qDebug( "Switch back to normal" );
+        //odebug << "Switch back to normal" << oendl ;
         pw->changeCharSet( baseSets.at(currCharSet), currCharSet );
@@ -461,3 +463,3 @@ void QIMPenInput::handleExtended( const QString &ex )
         QString set = ex.mid( 7 );
-        qDebug( "Select new profile: %s", set.latin1() );
+        odebug << "Select new profile: " << set.latin1() << oendl;
         selectProfile( set );
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
@@ -27,2 +27,3 @@
 #include <qtimer.h>
+#include <opie2/odebug.h>
 
@@ -70,3 +71,3 @@ void QIMPenMatch::strokeEntered( QIMPenStroke *st )
 #ifdef DEBUG_QIMPEN
-    qDebug( "---------- new stroke -------------" );
+    odebug << "---------- new stroke -------------" << oendl;
 #endif
@@ -83,3 +84,3 @@ void QIMPenMatch::strokeEntered( QIMPenStroke *st )
 #ifdef DEBUG_QIMPEN
-        qDebug( "Matching against multi set" );
+        odebug << "Matching against multi set" << oendl;
 #endif
@@ -88,3 +89,3 @@ void QIMPenMatch::strokeEntered( QIMPenStroke *st )
 #ifdef DEBUG_QIMPEN
-        qDebug( "Matching against single set" );
+        odebug << "Matching against single set" << oendl;
 #endif
@@ -99,3 +100,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-    qDebug( "Entering strokes.count() = %d", strokes.count() );
+    odebug << "Entering strokes.count() = " <<  strokes.count() << oendl;
 #endif
@@ -109,3 +110,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-        qDebug( QString("Candidate1 = %1").arg(QChar(candidate1.penChar->character())) );
+        odebug << "Candidate1 = " << candidate1.penChar->character() << oendl;
 #endif
@@ -122,3 +123,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-            qDebug( QString("Candidate2 = %1").arg(QChar(candidate2.penChar->character())) );
+            odebug << "Candidate2 = " << candidate2.penChar->character() << oendl;
 #endif
@@ -144,3 +145,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Using Candidate2" );
+            odebug << "** Using Candidate2" << oendl;
 #endif
@@ -153,3 +154,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Using Candidate1, with erase" );
+            odebug << "** Using Candidate1, with erase" << oendl;
 #endif
@@ -164,3 +165,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-        qDebug( "** Using Candidate1" );
+        odebug << "** Using Candidate1" << oendl;
 #endif
@@ -177,3 +178,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-        qDebug( "** Using Candidate2" );
+        odebug << "** Using Candidate2" << oendl;
 #endif
@@ -182,3 +183,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-            qDebug( "** Failed" );
+            odebug << "** Failed" << oendl; 
 #endif
@@ -187,3 +188,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-            qDebug( "Need more strokes" );
+            odebug << "Need more strokes" << oendl;
 #endif
@@ -199,3 +200,3 @@ void QIMPenMatch::processMatches( QIMPenCharMatchList &ml )
 #ifdef DEBUG_QIMPEN
-        qDebug( "deleting last" );
+        odebug << "deleting last" << oendl;
 #endif
@@ -230,3 +231,3 @@ void QIMPenMatch::updateWordMatch( QIMPenCharMatchList &ml )
          code == Qt::Key_Tab || code == Qt::Key_Escape ) {
-        //qDebug( "Word Matching: Clearing word" );
+        //odebug << "Word Matching: Clearing word" << oendl;
         wordChars.clear();
@@ -235,3 +236,3 @@ void QIMPenMatch::updateWordMatch( QIMPenCharMatchList &ml )
     } else if ( code == Qt::Key_Backspace ) {
-        //qDebug( "Word Matching: Handle backspace" );
+        //odebug << "Word Matching: Handle backspace" << oendl;
         wordChars.removeLast();
@@ -283,3 +284,3 @@ void QIMPenMatch::matchWords()
         for ( ; it.current(); ++it ) {
-            qDebug( QString("Match word: %1").arg(it.current()->word) );
+            odebug << "Match word: " << it.current()->word << oendl;
         }
@@ -287,3 +288,3 @@ void QIMPenMatch::matchWords()
     }
-    //qDebug( "Possibles: Good %d, total %d", goodMatches, wordMatches.count() );
+    //odebug << "Possibles: Good " << goodMatches << ", total " << wordMatches.count() << oendl;
     wordMatches.sort();
diff --git a/inputmethods/handwriting/qimpenstroke.cpp b/inputmethods/handwriting/qimpenstroke.cpp
index 3567d6d..14e435a 100644
--- a/inputmethods/handwriting/qimpenstroke.cpp
+++ b/inputmethods/handwriting/qimpenstroke.cpp
@@ -26,2 +26,3 @@
 #include "qimpenstroke.h"
+#include "opie2/odebug.h"
 
@@ -51,3 +52,3 @@ QIMPenStroke &QIMPenStroke::operator=( const QIMPenStroke &s )
     clear();
-    //qDebug( "copy strokes %d", s.links.count() );
+    //odebug << "copy strokes " << s.links.count() << oendl;
     startPoint = s.startPoint;
@@ -151,3 +152,3 @@ void QIMPenStroke::endInput()
 
-    //qDebug("Points: %d", links.count() );
+    //odebug << "Points: " << links.count() << oendl; 
 }
@@ -171,3 +172,3 @@ unsigned int QIMPenStroke::match( QIMPenStroke *pen )
 #ifdef DEBUG_QIMPEN
-        qDebug( "stroke length too different" );
+        odebug << "stroke length too different" << oendl;
 #endif
@@ -217,3 +218,3 @@ unsigned int QIMPenStroke::match( QIMPenStroke *pen )
 #ifdef DEBUG_QIMPEN
-        qDebug( "tsig too great: %d", err1 );
+        odebug << "tsig too great: " << err1 << oendl;
 #endif
@@ -226,3 +227,3 @@ unsigned int QIMPenStroke::match( QIMPenStroke *pen )
 #ifdef DEBUG_QIMPEN
-        qDebug( "dsig too great: %d", err2 );
+        odebug << "dsig too great: " <<  err2 << oendl;
 #endif
@@ -234,3 +235,3 @@ unsigned int QIMPenStroke::match( QIMPenStroke *pen )
 #ifdef DEBUG_QIMPEN
-        qDebug( "asig too great: %d", err3 );
+        odebug << "asig too great: " << err3 << oendl;
 #endif
@@ -249,3 +250,3 @@ unsigned int QIMPenStroke::match( QIMPenStroke *pen )
 #ifdef DEBUG_QIMPEN
-    qDebug( "err %d   ( %d, %d, %d, %d)", err, err1, err2, err3, vdiff );
+    odebug << "err " << err << "( " << err1 << ", " << err2 << ", " << err3 << ", " << vdiff << oendl;
 #endif
diff --git a/inputmethods/handwriting/qimpenwordpick.cpp b/inputmethods/handwriting/qimpenwordpick.cpp
index 8ee103d..39745c6 100644
--- a/inputmethods/handwriting/qimpenwordpick.cpp
+++ b/inputmethods/handwriting/qimpenwordpick.cpp
@@ -106,3 +106,3 @@ void QIMPenWordPick::mouseReleaseEvent( QMouseEvent *e )
     if ( wordIdx >= 0 && wordIdx == clickWord ) {
-        //qDebug( "Clicked %s", words[wordIdx].latin1() );
+        //odebug << "Clicked " <<  words[wordIdx].latin1() << oendl;
         emit wordClicked( words[wordIdx] );