summaryrefslogtreecommitdiff
path: root/noncore/net/opietooth/lib/manager.cc
Unidiff
Diffstat (limited to 'noncore/net/opietooth/lib/manager.cc') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc12
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
@@ -62,7 +62,7 @@ void Manager::searchDevices( const QString& device ){
62 this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); 62 this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
63 if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { 63 if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
64 qWarning("could not start"); 64 qWarning("could not start");
65 RemoteDevices::ValueList list; 65 RemoteDevice::ValueList list;
66 emit foundDevices( device, list ); 66 emit foundDevices( device, list );
67 delete hcitool; 67 delete hcitool;
68 } 68 }
@@ -112,7 +112,7 @@ void Manager::searchServices( const QString& remDevice ){
112 emit foundServices( remDevice, list ); 112 emit foundServices( remDevice, list );
113 } 113 }
114} 114}
115void Manager::searchServices( const RemoteDevices& dev){ 115void Manager::searchServices( const RemoteDevice& dev){
116 searchServices( dev.mac() ); 116 searchServices( dev.mac() );
117} 117}
118QString Manager::toDevice( const QString& mac ){ 118QString Manager::toDevice( const QString& mac ){
@@ -162,7 +162,7 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
162 162
163void Manager::slotHCIExited(OProcess* proc ) { 163void Manager::slotHCIExited(OProcess* proc ) {
164 qWarning("process exited"); 164 qWarning("process exited");
165 RemoteDevices::ValueList list; 165 RemoteDevice::ValueList list;
166 if (proc->normalExit() ) { 166 if (proc->normalExit() ) {
167 qWarning("normalExit %s", proc->name() ); 167 qWarning("normalExit %s", proc->name() );
168 QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); 168 QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
@@ -190,9 +190,9 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) {
190 190
191 m_devices.replace( proc->name(), string ); 191 m_devices.replace( proc->name(), string );
192} 192}
193RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) { 193RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
194 qWarning("parseHCI %s", output.latin1() ); 194 qWarning("parseHCI %s", output.latin1() );
195 RemoteDevices::ValueList list; 195 RemoteDevice::ValueList list;
196 QStringList strList = QStringList::split('\n', output ); 196 QStringList strList = QStringList::split('\n', output );
197 QStringList::Iterator it; 197 QStringList::Iterator it;
198 QString str; 198 QString str;
@@ -205,7 +205,7 @@ RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) {
205 str.remove( 0, 17 ); 205 str.remove( 0, 17 );
206 qWarning("mac %s", mac.latin1() ); 206 qWarning("mac %s", mac.latin1() );
207 qWarning("rest:%s", str.latin1() ); 207 qWarning("rest:%s", str.latin1() );
208 RemoteDevices rem( mac , str.stripWhiteSpace() ); 208 RemoteDevice rem( mac , str.stripWhiteSpace() );
209 list.append( rem ); 209 list.append( rem );
210 } 210 }
211 } 211 }