1 files changed, 11 insertions, 12 deletions

diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 33df6c4..e339dc7 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -23,4 +23,5 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/oglobal.h>
-
 #ifdef Q_WS_QWS
@@ -29,5 +30,6 @@
 #include <qtopia/qpeapplication.h>
-
 #include <qtopia/version.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qtextstream.h>
@@ -38,2 +40,3 @@
 
+/* STD */
 #ifndef _XOPEN_SOURCE
@@ -51,8 +54,4 @@
 
-
-//#define INSECURE
-
 const int block_size = 51200;
 
-using namespace Opie::Core;
 QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
@@ -64,3 +63,3 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
     if ( !ok() )
-        qWarning( "Failed to bind to port %d", port );
+    owarn << "Failed to bind to port " << port << "" << oendl;
     else {
@@ -173,3 +172,3 @@ void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArra
     if ( paren <= 0 ) {
-        qDebug("DesktopMessage: bad qcop syntax");
+    odebug << "DesktopMessage: bad qcop syntax" << oendl;
         return;
@@ -179,3 +178,3 @@ void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArra
     if ( params[params.length()-1] != ')' ) {
-        qDebug("DesktopMessage: bad qcop syntax");
+    odebug << "DesktopMessage: bad qcop syntax" << oendl;
         return;
@@ -206,3 +205,3 @@ void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArra
             } 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;
@@ -334,3 +333,3 @@ void QCopBridgePI::send( const QString& msg )
     os << msg << endl;
-    //qDebug( "sending qcop message: %s", msg.latin1() );
+    //odebug << "sending qcop message: " << msg << "" << oendl;
 }
@@ -347,3 +346,3 @@ void QCopBridgePI::process( const QString& message )
 {
-    //qDebug( "Command: %s", message.latin1() );
+    //odebug << "Command: " << message << "" << oendl;