author | harlekin <harlekin> | 2003-03-06 22:32:09 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-06 22:32:09 (UTC) |
commit | 94a385f5f6868e930361dc8d25d3e87eacd20feb (patch) (side-by-side diff) | |
tree | 5dd0eb454abbac301547b6784436c5a709a9b264 | |
parent | e2165a29b9fc618037295fc7515e0364b9a3da4f (diff) | |
download | opie-94a385f5f6868e930361dc8d25d3e87eacd20feb.zip opie-94a385f5f6868e930361dc8d25d3e87eacd20feb.tar.gz opie-94a385f5f6868e930361dc8d25d3e87eacd20feb.tar.bz2 |
dont show the Connections: from the hcitool output
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 59ade6d..8ddcfe8 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -253,42 +253,45 @@ void Manager::searchConnections() { *proc << "hcitool"; *proc << "con"; if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { ConnectionState::ValueList list; emit connections( list ); delete proc; } } void Manager::slotConnectionExited( OProcess* proc ) { qWarning("<<<<<<<<<<<<<<<<<exited"); ConnectionState::ValueList list; list = parseConnections( m_hcitoolCon ); emit connections(list ); delete proc; } -void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) { +void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { QCString str(cha, len ); m_hcitoolCon.append( str ); //delete proc; } ConnectionState::ValueList Manager::parseConnections( const QString& out ) { ConnectionState::ValueList list2; QStringList list = QStringList::split('\n', out ); QStringList::Iterator it; - for (it = list.begin(); it != list.end(); ++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 ); 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() ); ConnectionState con; con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); con.setConnectionMode( value[1] ); con.setMac( value[2] ); con.setHandle( value[4].toInt() ); |