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,4 +1,13 @@
-#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" {
@@ -7,6 +16,2 @@ extern "C" {
 
-#include "krfblogin.h"
-#include "krfbconnection.h"
-#include <qtimer.h>
-
 // The length of the various messages (used to decide how many bytes to
@@ -54,3 +59,3 @@ KRFBLogin::KRFBLogin( KRFBConnection *con )
 
-  qWarning( "Waiting for server version..." );
+  owarn << "Waiting for server version..." << oendl; 
 
@@ -76,3 +81,3 @@ void KRFBLogin::gotServerVersion()
 {
-  qWarning( "Got server version" );
+  owarn << "Got server version" << oendl; 
 
@@ -94,3 +99,3 @@ void KRFBLogin::gotServerVersion()
 
-    qWarning( msg );
+    owarn << msg << oendl; 
     emit error( msg );
@@ -108,3 +113,3 @@ void KRFBLogin::gotServerVersion()
 
-  qWarning("Server Version: %03d.%03d", serverMajor, serverMinor );
+  owarn << "Server Version: " << serverMajor << "." << serverMinor << "" << oendl; 
 
@@ -114,3 +119,3 @@ void KRFBLogin::gotServerVersion()
 
-    qWarning( msg );
+    owarn << msg << oendl; 
     emit error( msg );
@@ -121,3 +126,3 @@ void KRFBLogin::gotServerVersion()
   if ( serverMinor != 3 ) {
-    qWarning( "Minor version mismatch: %d", serverMinor );
+    owarn << "Minor version mismatch: " << serverMinor << "" << oendl; 
   }
@@ -145,3 +150,3 @@ void KRFBLogin::gotAuthScheme()
   case 0:
-    qWarning( "Failed" );
+    owarn << "Failed" << oendl; 
     // Handle failure
@@ -161,3 +166,3 @@ void KRFBLogin::gotAuthScheme()
   default:
-    qWarning( "Unknown authentication scheme, 0x%08lx", scheme );
+    owarn << "Unknown authentication scheme, 0x" << scheme << "" << oendl; 
     currentState = Error;
@@ -183,3 +188,3 @@ void KRFBLogin::getPassword()
   if ( con->options_->password.isNull() ) {
-    qWarning( "krfblogin needs a password" );
+    owarn << "krfblogin needs a password" << oendl; 
     emit passwordRequired( con );
@@ -218,3 +223,3 @@ void KRFBLogin::gotAuthResult()
 
-  qWarning( "Authentication Result is 0x%08lx", result );
+  owarn << "Authentication Result is 0x" << result << "" << oendl; 
 
@@ -234,3 +239,3 @@ void KRFBLogin::gotAuthResult()
   case AuthFailed:
-    qWarning( "Dammit" );
+    owarn << "Dammit" << oendl; 
     emit status( statusMsgFailed );
@@ -243,3 +248,3 @@ void KRFBLogin::gotAuthResult()
   default:
-    qWarning( "Invalid authentication result, %lx", result );
+    owarn << "Invalid authentication result, " << result << "" << oendl; 
     break;
@@ -250,3 +255,3 @@ void KRFBLogin::sendClientVersion()
 {
-  qWarning( "Sending client version" );
+  owarn << "Sending client version" << oendl; 
   con->write( (void*)"RFB 003.003\n", ClientVersionLength );