3 files changed, 116 insertions, 104 deletions

diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 04c50d9..f81066e 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -1,7 +1,12 @@
 
-#include <signal.h>
+#include "device.h"
 
+/* OPIE */
 #include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* STD */
+#include <signal.h>
 
-#include "device.h"
 
@@ -16,6 +21,6 @@ namespace {
     for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
-    qWarning("parsePID: %s", (*it).latin1() );
+    owarn << "parsePID: " << (*it).latin1() << oendl;
       if( !(*it).startsWith("CSR") ){
-        id = (*it).toInt();
-        break;
+    id = (*it).toInt();
+    break;
       }
@@ -29,3 +34,3 @@ Device::Device(const QString &device, const QString &mode, const QString &speed
 
-  qWarning("OpieTooth::Device create" );
+  owarn << "OpieTooth::Device create" << oendl;
   m_hci = 0;
@@ -42,6 +47,6 @@ Device::~Device(){
 void Device::attach(){
-  qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() );
+  owarn << "attaching " << m_device.latin1() << " " << m_mode.latin1() << " " << m_speed.latin1() << oendl;
   if(m_process == 0 ){
     m_output.resize(0);
-    qWarning("new process to create" );
+    owarn << "new process to create" << oendl;
     m_process = new OProcess();
@@ -57,3 +62,3 @@ void Device::attach(){
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
-      qWarning("Could not start" );
+      owarn << "Could not start" << oendl;
       delete m_process;
@@ -69,6 +74,6 @@ void Device::detach(){
     //kill the pid
-    qWarning( "killing" );
+    warn << "killing" << oendl;
     kill(pid, 9);
   }
-  qWarning("detached" );
+  owarn << "detached" << oendl;
 }
@@ -82,30 +87,30 @@ void Device::slotExited( OProcess* proc)
 {
-  qWarning("prcess exited" );
+  owarn << "prcess exited" << oendl;
   if(proc== m_process ){
-    qWarning("proc == m_process" );
+    owarn << "proc == m_process" << oendl;
     if( m_process->normalExit() ){ // normal exit
-      qWarning("normalExit" );
+      owarn << "normalExit" << oendl;
       int ret = m_process->exitStatus();
       if( ret == 0 ){ // attached
-        qWarning("attached" );
-        qWarning("Output: %s", m_output.data() );
-        pid = parsePid( m_output );
-        qWarning("Pid = %d", pid );
-        // now hciconfig hci0 up ( determine hciX FIXME)
-        // and call hciconfig hci0 up
-        // FIXME hardcoded to hci0 now :(
-        m_hci = new OProcess( );
-        *m_hci << "hciconfig";
-        *m_hci << "hci0 up";
-        connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
+    owarn << "attached" << oendl;
+    owarn << "Output: " << m_output.data() << oendl;
+    pid = parsePid( m_output );
+    owarn << "Pid = " << pid << oendl;
+    // now hciconfig hci0 up ( determine hciX FIXME)
+    // and call hciconfig hci0 up
+    // FIXME hardcoded to hci0 now :(
+    m_hci = new OProcess( );
+    *m_hci << "hciconfig";
+    *m_hci << "hci0 up";
+    connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
                 this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
-        if(!m_hci->start() ){
-          qWarning("could not start" );
-          m_attached = false;
-          emit device("hci0", false );
-        }
+    if(!m_hci->start() ){
+      owarn << "could not start" << oendl;
+      m_attached = false;
+      emit device("hci0", false );
+    }
       }else{
-        qWarning("crass" );
-        m_attached = false;
-        emit device("hci0", false );
+        owarn << "crass" << oendl;
+    m_attached = false;
+    emit device("hci0", false );
 
@@ -116,14 +121,14 @@ void Device::slotExited( OProcess* proc)
   }else if(proc== m_hci ){
-    qWarning("M HCI exited" );
+    owarn << "M HCI exited" << oendl;
     if( m_hci->normalExit() ){
-      qWarning("normal exit" );
+      owarn << "normal exit" << oendl;
       int ret = m_hci->exitStatus();
       if( ret == 0 ){
-        qWarning("attached really really attached" );
-        m_attached = true;
-        emit device("hci0", true );
+    owarn << "attached really really attached" << oendl;
+    m_attached = true;
+    emit device("hci0", true );
       }else{
-        qWarning( "failed" );
-        emit device("hci0", false );
-        m_attached = false;
+    owarn << "failed" << oendl;
+    emit device("hci0", false );
+    m_attached = false;
       }
@@ -136,5 +141,5 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len)
 {
-  qWarning("std out" );
+  owarn << "std out" << oendl;
   if( len <1 ){
-    qWarning( "len < 1 " );
+    owarn << "len < 1 " << oendl;
     return;
@@ -143,3 +148,3 @@ void Device::slotStdOut(OProcess* proc, char* chars, int len)
     QCString string( chars, len+1 ); // \0 == +1
-    qWarning("output: %s", string.data() );
+    owarn << "output: " << string.data() << oendl;
     m_output.append( string.data() );
@@ -149,3 +154,3 @@ void Device::slotStdErr(OProcess* proc, char* chars, int len)
 {
-  qWarning("std err" );
+  owarn << "std err" << oendl;
   slotStdOut( proc, chars, len );
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 18e1df9..76d9127 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -1,5 +1,2 @@
 
-
-#include <opie2/oprocess.h>
-
 #include "parser.h"
@@ -7,2 +4,6 @@
 
+#include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 
@@ -14,3 +15,3 @@ Manager::Manager( const QString& dev )
 {
-    qWarning("created");
+    owarn << "created" << oendl;
     m_device = dev;
@@ -59,3 +60,3 @@ void Manager::isAvailable( Device* /*dev*/ ){
 void Manager::searchDevices( const QString& device ){
-    qWarning("search devices");
+    owarn << "search devices" << oendl;
     OProcess* hcitool = new OProcess();
@@ -68,3 +69,3 @@ void Manager::searchDevices( const QString& device ){
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning("could not start");
+        owarn << "could not start" << oendl;
         RemoteDevice::ValueList list;
@@ -109,3 +110,3 @@ void Manager::searchServices( const QString& remDevice ){
     m_sdp->setName( remDevice.latin1() );
-    qWarning("search Services for %s", remDevice.latin1() );
+    owarn << "search Services for " << remDevice.latin1() << oendl;
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
@@ -115,3 +116,3 @@ void Manager::searchServices( const QString& remDevice ){
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
-        qWarning("could not start sdptool" );
+        owarn << "could not start sdptool" << oendl;
         delete m_sdp;
@@ -142,3 +143,3 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
     QCString str(ch,  len+1 );
-    qWarning("SDP:%s", str.data() );
+    owarn << "SDP:" << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
@@ -155,3 +156,3 @@ void Manager::slotSDPExited( OProcess* proc)
 {
-    qWarning("proc name %s", proc->name() );
+    owarn << "proc name " << proc->name() << oendl;
     Services::ValueList  list;
@@ -160,3 +161,3 @@ void Manager::slotSDPExited( OProcess* proc)
         if ( it != m_out.end() ) {
-            qWarning("found process" );
+        owarn << "found process" << oendl;
             list = parseSDPOutput( it.data() );
@@ -170,3 +171,3 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
-    qWarning("parsing output" );
+    owarn << "parsing output" << oendl;
     Parser parser( out );
@@ -177,9 +178,9 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
 void Manager::slotHCIExited(OProcess* proc ) {
-    qWarning("process exited");
+    owarn << "process exited" << oendl;
     RemoteDevice::ValueList list;
     if (proc->normalExit() ) {
-        qWarning("normalExit %s",  proc->name() );
+        owarn << "normalExit " << proc->name() << oendl;
         QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
         if (it != m_devices.end() ) {
-            qWarning("!= end ;)");
+            owarn << "!= end ;)" << oendl;
             list = parseHCIOutput( it.data() );
@@ -193,9 +194,9 @@ void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     QCString str( ch, len+1 );
-    qWarning("hci: %s",  str.data() );
+    owarn << "hci: " << str.data() oendl;
     QMap<QString, QString>::Iterator it;
     it = m_devices.find( proc->name() );
-    qWarning("proc->name %s", proc->name() );
+    owarn << "proc->name " << proc->name() << oendl;
     QString string;
     if (it != m_devices.end() ) {
-        qWarning("slotHCIOut ");
+        owarn << "slotHCIOut " << oendl;
         string = it.data();
@@ -207,3 +208,3 @@ void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
 RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
-    qWarning("parseHCI %s",  output.latin1() );
+    owarn << "parseHCI " << output.latin1() << oendl;
     RemoteDevice::ValueList list;
@@ -214,3 +215,3 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
         str = (*it).stripWhiteSpace();
-        qWarning("OpieTooth %s", str.latin1() );
+        owarn << "OpieTooth " << str.latin1() << oendl;
         int pos = str.findRev(':' );
@@ -219,4 +220,4 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
             str.remove( 0,  17 );
-            qWarning("mac %s",  mac.latin1() );
-            qWarning("rest:%s",  str.latin1() );
+            owarn << "mac " << mac.latin1() << oendl;
+            owarn << "rest: " << str.latin1() << oendl;
             RemoteDevice rem( mac , str.stripWhiteSpace() );
@@ -245,3 +246,3 @@ void Manager::connectTo( const QString& mac) {
 void Manager::searchConnections() {
-    qWarning("searching connections?");
+    owarn << "searching connections?" << oendl;
     OProcess* proc = new OProcess();
@@ -283,11 +284,11 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
         QStringList value = QStringList::split(' ', row );
-        qWarning("0: %s", value[0].latin1() );
-        qWarning("1: %s", value[1].latin1() );
-        qWarning("2: %s", value[2].latin1() );
-        qWarning("3: %s", value[3].latin1() );
-        qWarning("4: %s", value[4].latin1() );
-        qWarning("5: %s", value[5].latin1() );
-        qWarning("6: %s", value[6].latin1() );
-        qWarning("7: %s", value[7].latin1() );
-        qWarning("8: %s", value[8].latin1() );
+        owan << "0: %s" << value[0].latin1() << oendl;
+        owan << "1: %s" << value[1].latin1() << oendl;
+        owan << "2: %s" << value[2].latin1() << oendl;
+        owan << "3: %s" << value[3].latin1() << oendl;
+        owan << "4: %s" << value[4].latin1() << oendl;
+        owan << "5: %s" << value[5].latin1() << oendl;
+        owan << "6: %s" << value[6].latin1() << oendl;
+        owan << "7: %s" << value[7].latin1() << oendl;
+        owan << "8: %s" << value[8].latin1() << oendl;
         ConnectionState con;
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 8baf284..7e95907 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -1,5 +1,11 @@
 
+#include "parser.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstringlist.h>
 
-#include "parser.h"
 
@@ -15,3 +21,3 @@ namespace {
 int convert( const QString& line, QString& ret ) {
-//    qWarning("called");
+//    owarn << "called" << oendl;
     ret = QString::null;
@@ -21,9 +27,9 @@ int convert( const QString& line, QString& ret ) {
         ret = line.left(pos ).stripWhiteSpace();
-        //      qWarning("ret: %s",  ret.latin1() );
+        //      owarn << "ret: " << ret.latin1() << oendl;
         ret = ret.replace(QRegExp("[\"]"), "");
-        //qWarning("ret: %s", ret.latin1() );
+        //owarn << "ret: " << ret.latin1() << oendl;
         QString dummy = line.mid(pos + 5 );
-        //qWarning("dummy: %s",  dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
         dummy = dummy.replace(QRegExp("[)]"), "");
-        //qWarning("dummy: %s", dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
 //        dummy = dummy.remove( dummy.length() -2, 1 ); // remove the )
@@ -32,8 +38,8 @@ int convert( const QString& line, QString& ret ) {
         //if (ok ) {
-        //     qWarning("converted %d",  i);
-        //}else qWarning("failed" );
-        //qWarning("exiting");
+        //     owarn << "converted " << i << oendl;
+        //}else owarn << "failed" << oendl;
+        //owarn << "exiting" << oendl;
         return i;
     }
-    //qWarning("output %d", i );
+    //owarn << "output " << i << oendl;
     return i;
@@ -59,3 +65,3 @@ void Parser::parse( const QString& string) {
     for (it = list.begin(); it != list.end(); ++it ) {
-        //qWarning("line:%s:line", (*it).latin1() );
+        //owarn << "line:" << (*it).latin1() << oendl;
         if ( (*it).startsWith("Browsing") ) continue;
@@ -63,3 +69,3 @@ void Parser::parse( const QString& string) {
         if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins
-            qWarning("could add");
+            owarn << "could add" << oendl;
             // now see if complete and add
@@ -82,3 +88,3 @@ void Parser::parse( const QString& string) {
     if (m_complete) {
-//        qWarning("adding");
+//        owarn << "adding" << oendl;
         if (!m_item.serviceName().isEmpty() )
@@ -89,5 +95,5 @@ void Parser::parse( const QString& string) {
     if (m_list.isEmpty() )
-        qWarning("m_list is empty");
+        owarn << "m_list is empty" << oendl;
     for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
-        qWarning("name %s", (*it2).serviceName().latin1() );
+        owarn << "name " << (*it2).serviceName().latin1() << oendl;
     }
@@ -97,3 +103,3 @@ bool Parser::parseName( const QString& str) {
         m_item.setServiceName( str.mid(13).stripWhiteSpace() );
-        qWarning(m_item.serviceName() );
+        owarn << m_item.serviceName() << oendl;
         return true;
@@ -105,3 +111,3 @@ bool Parser::parseRecHandle( const QString& str) {
         QString out = str.mid(18 ).stripWhiteSpace();
-        qWarning("out %s", out.latin1() );
+        owarn << "out " << out.latin1() << oendl;
         int value = out.mid(2).toInt(&m_ok, 16 );
@@ -111,3 +117,3 @@ bool Parser::parseRecHandle( const QString& str) {
             m_complete = false;
-        qWarning("rec handle %d",  value);
+        owarn << "rec handle " << value << oendl;
         m_item.setRecHandle( value );
@@ -120,4 +126,4 @@ bool Parser::parseClassId( const QString& str) {
     if (str.startsWith("Service Class ID List:") ) {
-        qWarning("found class id" );
-        qWarning("line:%s", str.latin1() );
+        owarn << "found class id" << oendl;
+        owarn << "line: " << str.latin1() << oendl;
         m_classOver = true;
@@ -125,4 +131,4 @@ bool Parser::parseClassId( const QString& str) {
     }else if ( m_classOver && str.startsWith("  " )  ){ // ok now are the informations in place
-        qWarning("line with class id" );
-        qWarning("%s",str.latin1() );
+        owarn << "line with class id" << oendl;
+        owarn << str.latin1() << oendl;
 
@@ -135,3 +141,3 @@ bool Parser::parseClassId( const QString& str) {
         ids = convert( str, classes );
-        qWarning("ids %d", ids );
+        owarn << "ids " << ids << oendl;
         m_item.insertClassId( ids, classes );
@@ -140,3 +146,3 @@ bool Parser::parseClassId( const QString& str) {
     }else{
-        qWarning("Else %d", m_classOver );
+        owarn << "Else " << m_classOver << oendl;
         m_classOver = false;
@@ -152,3 +158,3 @@ bool Parser::parseProtocol( const QString& str) {
     }else if (m_protocolOver && str.startsWith("  ") ) { // "L2CAP" (0x0100)
-        qWarning("double protocol filter");
+        owarn << "double protocol filter" << oendl;
 
@@ -164,3 +170,3 @@ bool Parser::parseProtocol( const QString& str) {
     }else if (m_protocolOver && str.startsWith("   ") ) {
-        qWarning("tripple protocol filter");
+        owarn << "tripple protocol filter" << oendl;
         m_protocolAdded = true;
@@ -189,3 +195,3 @@ bool Parser::parseProfile( const QString& str) {
             int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt();
-            qWarning("dummyInt:%d",  dummy );
+            owarn << "dummyInt: " << dummy << oendl;
             Services::ProfileDescriptor desc( m_profName, m_profId, dummy );