1 files changed, 34 insertions, 29 deletions

diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index db95154..69457e2 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -5,5 +5,10 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qpixmap.h>
 
+/* STD */
 #include <assert.h>
@@ -13,3 +18,3 @@
 //
-#ifndef KDE_USE_FINAL
+#ifndef OPIE_NO_DEBUG
 const int endianTest = 1;
@@ -137,3 +142,3 @@ void KRFBDecoder::sendClientInit()
   // Wait for server init
-  qWarning( "Waiting for server init" );
+  owarn << "Waiting for server init" << oendl; 
 
@@ -149,3 +154,3 @@ void KRFBDecoder::gotServerInit()
 {
-  qWarning( "Got server init" );
+  owarn << "Got server init" << oendl; 
   disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) );
@@ -183,3 +188,3 @@ void KRFBDecoder::gotServerInit()
 
-  qWarning( "Width = %d, Height = %d", info->width, info->height );
+  owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl; 
   qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d",
@@ -194,3 +199,3 @@ void KRFBDecoder::gotServerInit()
   // Wait for desktop name
-  qWarning( "Waiting for desktop name" );
+  owarn << "Waiting for desktop name" << oendl; 
 
@@ -209,3 +214,3 @@ void KRFBDecoder::gotDesktopName()
 
-  qWarning( "Got desktop name" );
+  owarn << "Got desktop name" << oendl; 
 
@@ -221,3 +226,3 @@ void KRFBDecoder::gotDesktopName()
 
-  qWarning( "Desktop: %s", info->name.latin1() );
+  owarn << "Desktop: " << info->name.latin1() << "" << oendl; 
 
@@ -373,3 +378,3 @@ void KRFBDecoder::gotUpdateHeader()
 
-  //  qWarning( "Got update header" );
+  //  owarn << "Got update header" << oendl; 
 
@@ -408,3 +413,3 @@ void KRFBDecoder::gotUpdateHeader()
 
-  //  qWarning( "Expecting %d rects", noRects );
+  //  owarn << "Expecting " << noRects << " rects" << oendl; 
 
@@ -420,3 +425,3 @@ void KRFBDecoder::gotRectHeader()
 
-  //  qWarning( "Got rect header" );
+  //  owarn << "Got rect header" << oendl; 
 
@@ -448,3 +453,3 @@ void KRFBDecoder::gotRectHeader()
   if ( encoding == RawEncoding ) {
-      //    qWarning( "Raw encoding" );
+      //    owarn << "Raw encoding" << oendl; 
     handleRawRect();
@@ -452,3 +457,3 @@ void KRFBDecoder::gotRectHeader()
   else if ( encoding == CopyRectEncoding ) {
-//    qWarning( "CopyRect encoding" );
+//    owarn << "CopyRect encoding" << oendl; 
     handleCopyRect();
@@ -456,3 +461,3 @@ void KRFBDecoder::gotRectHeader()
   else if ( encoding == RreEncoding ) {
-    qWarning( "RRE encoding" );
+    owarn << "RRE encoding" << oendl; 
     handleRRERect();
@@ -460,3 +465,3 @@ void KRFBDecoder::gotRectHeader()
   else if ( encoding == CorreEncoding ) {
-    qWarning( "CoRRE encoding" );
+    owarn << "CoRRE encoding" << oendl; 
     handleCoRRERect();
@@ -464,3 +469,3 @@ void KRFBDecoder::gotRectHeader()
   else if ( encoding == HexTileEncoding ) {
-    qWarning( "HexTile encoding" );
+    owarn << "HexTile encoding" << oendl; 
     handleHexTileRect();
@@ -472,3 +477,3 @@ void KRFBDecoder::gotRectHeader()
     currentState = Error;
-    qWarning( "Unknown encoding, %d", msg );
+    owarn << "Unknown encoding, " << msg << "" << oendl; 
     emit error( protocolError );
@@ -488,3 +493,3 @@ void KRFBDecoder::handleRawRect()
 
-    //  qWarning( "Handling a raw rect chunk" );
+    //  owarn << "Handling a raw rect chunk" << oendl; 
 
@@ -511,3 +516,3 @@ void KRFBDecoder::getRawRectChunk( int lines )
   // Wait for server init
-  //  qWarning( "Waiting for raw rect chunk, %ld", count );
+  //  owarn << "Waiting for raw rect chunk, " << count << "" << oendl; 
 
@@ -525,3 +530,3 @@ void KRFBDecoder::gotRawRectChunk()
 
-  //  qWarning( "Got raw rect chunk" );
+  //  owarn << "Got raw rect chunk" << oendl; 
 
@@ -548,3 +553,3 @@ void KRFBDecoder::gotRawRectChunk()
 
-    //    qWarning( "There are %d rects left", noRects );
+    //    owarn << "There are " << noRects << " rects left" << oendl; 
 
@@ -592,3 +597,3 @@ void KRFBDecoder::gotCopyRectPos()
 
-  //    qWarning( "There are %d rects left", noRects );
+  //    owarn << "There are " << noRects << " rects left" << oendl; 
 
@@ -605,3 +610,3 @@ void KRFBDecoder::handleRRERect()
 {
-  qWarning( "RRE not implemented" );
+  owarn << "RRE not implemented" << oendl; 
 }
@@ -610,3 +615,3 @@ void KRFBDecoder::handleCoRRERect()
 {
-  qWarning( "CoRRE not implemented" );
+  owarn << "CoRRE not implemented" << oendl; 
 }
@@ -615,3 +620,3 @@ void KRFBDecoder::handleHexTileRect()
 {
-  qWarning( "HexTile not implemented" );
+  owarn << "HexTile not implemented" << oendl; 
 }
@@ -675,3 +680,3 @@ void KRFBDecoder::gotServerCut()
 {
-  qWarning( "Got server cut" );
+  owarn << "Got server cut" << oendl; 
 
@@ -723,3 +728,3 @@ void KRFBDecoder::gotServerCutText()
    * from within keypebble's mass of signals and slots
-  qWarning( "Server cut: %s", cutbuf );
+  owarn << "Server cut: " << cutbuf << "" << oendl; 
 
@@ -740,3 +745,3 @@ void KRFBDecoder::gotServerCutText()
   else {
-    qWarning( "Async handled in weird state" );
+    owarn << "Async handled in weird state" << oendl; 
     currentState = oldState;
@@ -747,3 +752,3 @@ void KRFBDecoder::gotBell()
 {
-  qWarning( "Got server bell" );
+  owarn << "Got server bell" << oendl; 
   buf->soundBell();
@@ -760,3 +765,3 @@ void KRFBDecoder::gotBell()
   else {
-    qWarning( "Async handled in weird state" );
+    owarn << "Async handled in weird state" << oendl; 
     currentState = oldState;