Diffstat (limited to 'noncore/net/opietooth/lib/manager.cc') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 40c1f0a..c454588 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -59,13 +59,13 @@ void Manager::searchDevices( const QString& device ){ connect( hcitool, SIGNAL(processExited(OProcess*) ) , this, SLOT(slotHCIExited(OProcess* ) ) ); connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { qWarning("could not start"); - RemoteDevices::ValueList list; + RemoteDevice::ValueList list; emit foundDevices( device, list ); delete hcitool; } } void Manager::searchDevices(Device* d ){ @@ -109,13 +109,13 @@ void Manager::searchServices( const QString& remDevice ){ if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { delete m_sdp; Services::ValueList list; emit foundServices( remDevice, list ); } } -void Manager::searchServices( const RemoteDevices& dev){ +void Manager::searchServices( const RemoteDevice& dev){ searchServices( dev.mac() ); } QString Manager::toDevice( const QString& mac ){ } QString Manager::toMac( const QString &device ){ @@ -159,13 +159,13 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) { Services::ValueList list; return list; } void Manager::slotHCIExited(OProcess* proc ) { qWarning("process exited"); - RemoteDevices::ValueList list; + RemoteDevice::ValueList list; if (proc->normalExit() ) { qWarning("normalExit %s", proc->name() ); QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); if (it != m_devices.end() ) { qWarning("!= end ;)"); list = parseHCIOutput( it.data() ); @@ -187,27 +187,27 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { string = it.data(); } string.append( str ); m_devices.replace( proc->name(), string ); } -RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) { +RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { qWarning("parseHCI %s", output.latin1() ); - RemoteDevices::ValueList list; + RemoteDevice::ValueList list; QStringList strList = QStringList::split('\n', output ); QStringList::Iterator it; QString str; for ( it = strList.begin(); it != strList.end(); ++it ) { str = (*it).stripWhiteSpace(); qWarning("OpieTooth %s", str.latin1() ); int pos = str.findRev(':' ); if ( pos > 0 ) { QString mac = str.left(17 ); str.remove( 0, 17 ); qWarning("mac %s", mac.latin1() ); qWarning("rest:%s", str.latin1() ); - RemoteDevices rem( mac , str.stripWhiteSpace() ); + RemoteDevice rem( mac , str.stripWhiteSpace() ); list.append( rem ); } } return list; } |