-rw-r--r-- | core/qws/qcopbridge.cpp | 18 |
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 @@ -21,15 +21,19 @@ #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> @@ -50,7 +54,7 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent , 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 ); @@ -110,13 +114,13 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args 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; } @@ -143,7 +147,7 @@ void QCopBridge::desktopMessage( const QCString &command, const QByteArray &args 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; @@ -235,7 +239,7 @@ QCopBridgePI::~QCopBridgePI() void QCopBridgePI::connectionClosed() { emit connectionClosed( this ); - // qDebug( "Debug: Connection closed" ); + // odebug << "Debug: Connection closed" << oendl; delete this; } @@ -250,7 +254,7 @@ 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() @@ -261,7 +265,7 @@ 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 ); |