1 files changed, 19 insertions, 12 deletions

diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp
index b447046..33e0563 100644
--- a/noncore/comm/keypebble/krfbconnection.cpp
+++ b/noncore/comm/keypebble/krfbconnection.cpp
@@ -1,14 +1,21 @@
-#include <assert.h>
-#include <qsocket.h>
-#include <qtimer.h>
-#include <string.h>
-
 #include "krfbconnection.h"
 #include "krfblogin.h"
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qsocket.h>
+#include <qtimer.h>
+
+/* STD */
+#include <assert.h>
+#include <string.h>
+
 KRFBConnection::KRFBConnection( QObject *parent )
 		: QObject( parent, "KRFBConnection" )
 {
 		portBase_ = 5900;
@@ -42,17 +49,17 @@ void KRFBConnection::connectTo( KRFBServer server)
 		// Connect to something to notice connection or error
 		connect( sock, SIGNAL( error(int) ), SLOT( gotSocketError(int) ) );
 		connect( sock, SIGNAL( connected() ), SLOT( gotSocketConnection() ) );
 
-		qWarning( "Connecting..." );
+		owarn << "Connecting..." << oendl; 
 
 		currentState_ = Connecting;
 		sock->connectToHost( options_->hostname.latin1(), portBase_ + options_->display );
 }
 
 void KRFBConnection::disconnect()
 {
-		qWarning( "Disconnecting from server" );
+		owarn << "Disconnecting from server" << oendl; 
 
 		if ( ( currentState_ != Disconnected )
 						&& ( currentState_ != Disconnecting )
 						&& sock ) {
@@ -81,9 +88,9 @@ void KRFBConnection::disconnectDone()
 void KRFBConnection::gotSocketConnection()
 {
 		currentState_ = LoggingIn;
 
-		qWarning( "Connected, logging in..." );
+		owarn << "Connected, logging in..." << oendl; 
 
 		static QString statusMsg = tr( "Connected" );
 		emit statusChanged( statusMsg );
 
@@ -92,9 +99,9 @@ void KRFBConnection::gotSocketConnection()
 }
 
 void KRFBConnection::gotRFBConnection()
 {
-		qWarning( "Logged into server" );
+		owarn << "Logged into server" << oendl; 
 
 		currentState_ = Connected;
 		emit connected();
 
@@ -121,9 +128,9 @@ void KRFBConnection::gotSocketError( int err )
 {
 		currentState_ = Error;
 
 		// Do some error handling stuff
-		qWarning( "KRFBConnection: Socket error %d", err );
+		owarn << "KRFBConnection: Socket error " << err << "" << oendl; 
 
 		static QString refused = tr( "Connection Refused" );
 		static QString host = tr( "Host not found" );
 		static QString read = tr( "Read Error: QSocket reported an error reading\n"
@@ -171,13 +178,13 @@ void KRFBConnection::waitForData( unsigned int sz )
 		assert( sz > 0 );
 		assert( currentState_ != Error );
 
 		if ( sock->size() >= sz ) {
-				//    qWarning( "No need to wait for data" );
+				//    owarn << "No need to wait for data" << oendl; 
 				emit gotEnoughData();
 		}
 		else {
-				//    qWarning( "Waiting for %u bytes", sz );
+				//    owarn << "Waiting for " << sz << " bytes" << oendl; 
 				minData_ = sz;
 				connect( sock, SIGNAL( readyRead() ), SLOT( gotMoreData() ) );
 		}
 }