1 files changed, 23 insertions, 18 deletions

diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp
index 2bbd110..92005d2 100644
--- a/noncore/comm/keypebble/krfblogin.cpp
+++ b/noncore/comm/keypebble/krfblogin.cpp
@@ -1,13 +1,18 @@
-#include <assert.h>
+#include "krfblogin.h"
+#include "krfbconnection.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qtimer.h>
 
+/* STD */
+#include <assert.h>
 extern "C" {
 #include "vncauth.h"
 }
 
-#include "krfblogin.h"
-#include "krfbconnection.h"
-#include <qtimer.h>
-
 // The length of the various messages (used to decide how many bytes to
 // wait for).
@@ -53,5 +58,5 @@ KRFBLogin::KRFBLogin( KRFBConnection *con )
 
 
-  qWarning( "Waiting for server version..." );
+  owarn << "Waiting for server version..." << oendl; 
 
   static QString statusMsg = tr( "Waiting for server version..." );
@@ -75,5 +80,5 @@ KRFBLogin::State KRFBLogin::state() const
 void KRFBLogin::gotServerVersion()
 {
-  qWarning( "Got server version" );
+  owarn << "Got server version" << oendl; 
 
   disconnect( con, SIGNAL( gotEnoughData() ), 
@@ -93,5 +98,5 @@ void KRFBLogin::gotServerVersion()
     static QString msg = tr( "Error: Invalid server version, %1" ).arg( rfbString );
 
-    qWarning( msg );
+    owarn << msg << oendl; 
     emit error( msg );
     currentState = Error;
@@ -107,5 +112,5 @@ void KRFBLogin::gotServerVersion()
     + (serverVersion[10] - '0');
 
-  qWarning("Server Version: %03d.%03d", serverMajor, serverMinor );
+  owarn << "Server Version: " << serverMajor << "." << serverMinor << "" << oendl; 
 
   if ( serverMajor != 3 ) {
@@ -113,5 +118,5 @@ void KRFBLogin::gotServerVersion()
       .arg( rfbString );
 
-    qWarning( msg );
+    owarn << msg << oendl; 
     emit error( msg );
     currentState = Error;
@@ -120,5 +125,5 @@ void KRFBLogin::gotServerVersion()
   
   if ( serverMinor != 3 ) {
-    qWarning( "Minor version mismatch: %d", serverMinor );
+    owarn << "Minor version mismatch: " << serverMinor << "" << oendl; 
   }
 
@@ -144,5 +149,5 @@ void KRFBLogin::gotAuthScheme()
   switch ( scheme ) {
   case 0:
-    qWarning( "Failed" );
+    owarn << "Failed" << oendl; 
     // Handle failure
     connect( con, SIGNAL( gotEnoughData() ), SLOT( gotFailureReasonSize() ) );
@@ -160,5 +165,5 @@ void KRFBLogin::gotAuthScheme()
     break;
   default:
-    qWarning( "Unknown authentication scheme, 0x%08lx", scheme );
+    owarn << "Unknown authentication scheme, 0x" << scheme << "" << oendl; 
     currentState = Error;
     break;
@@ -182,5 +187,5 @@ void KRFBLogin::getPassword()
   // Last chance to enter a password
   if ( con->options_->password.isNull() ) {
-    qWarning( "krfblogin needs a password" );
+    owarn << "krfblogin needs a password" << oendl; 
     emit passwordRequired( con );
   }
@@ -217,5 +222,5 @@ void KRFBLogin::gotAuthResult()
   result = Swap32IfLE( result );
 
-  qWarning( "Authentication Result is 0x%08lx", result );
+  owarn << "Authentication Result is 0x" << result << "" << oendl; 
 
   static QString failed = tr( "Error: The password you specified was incorrect." );
@@ -233,5 +238,5 @@ void KRFBLogin::gotAuthResult()
     break;
   case AuthFailed:
-    qWarning( "Dammit" );
+    owarn << "Dammit" << oendl; 
     emit status( statusMsgFailed );
     emit error( failed );
@@ -242,5 +247,5 @@ void KRFBLogin::gotAuthResult()
     break;
   default:
-    qWarning( "Invalid authentication result, %lx", result );
+    owarn << "Invalid authentication result, " << result << "" << oendl; 
     break;
   }
@@ -249,5 +254,5 @@ void KRFBLogin::gotAuthResult()
 void KRFBLogin::sendClientVersion()
 {
-  qWarning( "Sending client version" );
+  owarn << "Sending client version" << oendl; 
   con->write( (void*)"RFB 003.003\n", ClientVersionLength );
 }