1 files changed, 11 insertions, 7 deletions

diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp
index 4fd0807..822efb7 100644
--- a/core/qws/qcopbridge.cpp
+++ b/core/qws/qcopbridge.cpp
@@ -20,17 +20,21 @@
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
+/* OPIE */
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/version.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qtextstream.h>
 #ifdef QWS
 #include <qcopchannel_qws.h>
 #endif
 
+/* STD */
 #define _XOPEN_SOURCE
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -49,9 +53,9 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
-        qWarning( "Failed to bind to port %d", port );
+    owarn << "Failed to bind to port " << port << "" << oendl;
     else {
 #ifndef QT_NO_COP
         desktopChannel = new QCopChannel( "QPE/Desktop", this );
         connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)),
@@ -109,15 +113,15 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args
     command.stripWhiteSpace();
 
     int paren = command.find( "(" );
     if ( paren <= 0 ) {
-        qDebug("DesktopMessage: bad qcop syntax");
+    odebug << "DesktopMessage: bad qcop syntax" << oendl;
         return;
     }
 
     QString params = command.mid( paren + 1 );
     if ( params[params.length()-1] != ')' ) {
-        qDebug("DesktopMessage: bad qcop syntax");
+    odebug << "DesktopMessage: bad qcop syntax" << oendl;
         return;
     }
 
     params.truncate( params.length()-1 );
@@ -142,9 +146,9 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args
                 int i;
                 stream >> i;
                 str = QString::number( i );
             } else {
-                qDebug(" cannot route the argument type %s throught the qcop bridge", (*it).latin1() );
+        odebug << " cannot route the argument type " << (*it) << " throught the qcop bridge" << oendl;
                 return;
             }
             QString estr;
             for (int i=0; i<(int)str.length(); i++) {
@@ -234,9 +238,9 @@ QCopBridgePI::~QCopBridgePI()
 
 void QCopBridgePI::connectionClosed()
 {
     emit connectionClosed( this );
-    // qDebug( "Debug: Connection closed" );
+    // odebug << "Debug: Connection closed" << oendl;
     delete this;
 }
 
 void QCopBridgePI::sendDesktopMessage( const QString &msg )
@@ -249,9 +253,9 @@ void QCopBridgePI::sendDesktopMessage( const QString &msg )
 void QCopBridgePI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
-    //qDebug( "sending qcop message: %s", msg.latin1() );
+    //odebug << "sending qcop message: " << msg << "" << oendl;
 }
 
 void QCopBridgePI::read()
 {
@@ -260,9 +264,9 @@ void QCopBridgePI::read()
 }
 
 void QCopBridgePI::process( const QString& message )
 {
-    //qDebug( "Command: %s", message.latin1() );
+    //odebug << "Command: " << message << "" << oendl;
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;