| -rw-r--r-- | noncore/net/opietooth/lib/device.cc | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index f81066e..eea1178 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc @@ -63,25 +63,25 @@ void Device::attach(){ owarn << "Could not start" << oendl; delete m_process; m_process = 0; } }; } void Device::detach(){ delete m_hci; delete m_process; // kill the pid we got if(m_attached ){ //kill the pid - warn << "killing" << oendl; + owarn << "killing" << oendl; kill(pid, 9); } owarn << "detached" << oendl; } bool Device::isLoaded()const{ return m_attached; } QString Device::devName()const { return QString::fromLatin1("hci0"); }; void Device::slotExited( OProcess* proc) { diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 76d9127..53122c1 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -183,25 +183,25 @@ void Manager::slotHCIExited(OProcess* proc ) { QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); if (it != m_devices.end() ) { owarn << "!= end ;)" << oendl; list = parseHCIOutput( it.data() ); m_devices.remove( it ); } } emit foundDevices( proc->name(), list ); delete proc; } void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { QCString str( ch, len+1 ); - owarn << "hci: " << str.data() oendl; + owarn << "hci: " << str.data() << oendl; QMap<QString, QString>::Iterator it; it = m_devices.find( proc->name() ); owarn << "proc->name " << proc->name() << oendl; QString string; if (it != m_devices.end() ) { owarn << "slotHCIOut " << oendl; string = it.data(); } string.append( str ); m_devices.replace( proc->name(), string ); } @@ -273,33 +273,33 @@ void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { //delete proc; } ConnectionState::ValueList Manager::parseConnections( const QString& out ) { ConnectionState::ValueList list2; QStringList list = QStringList::split('\n', out ); QStringList::Iterator it; // remove the first line ( "Connections:") it = list.begin(); it = list.remove( it ); for (; it != list.end(); ++it ) { QString row = (*it).stripWhiteSpace(); QStringList value = QStringList::split(' ', row ); - 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; + owarn << "0: %s" << value[0].latin1() << oendl; + owarn << "1: %s" << value[1].latin1() << oendl; + owarn << "2: %s" << value[2].latin1() << oendl; + owarn << "3: %s" << value[3].latin1() << oendl; + owarn << "4: %s" << value[4].latin1() << oendl; + owarn << "5: %s" << value[5].latin1() << oendl; + owarn << "6: %s" << value[6].latin1() << oendl; + owarn << "7: %s" << value[7].latin1() << oendl; + owarn << "8: %s" << value[8].latin1() << oendl; ConnectionState con; con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); con.setConnectionMode( value[1] ); con.setMac( value[2] ); con.setHandle( value[4].toInt() ); con.setState( value[6].toInt() ); con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client ); list2.append( con ); } return list2; } |