summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc22
1 files changed, 14 insertions, 8 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 83accf7..7311484 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -61,10 +61,10 @@ void Manager::searchDevices( const QString& device ){
61 odebug << "Manager: search devices" << oendl; 61 odebug << "Manager: search devices" << oendl;
62 OProcess* hcitool = new OProcess(); 62 m_hcitool = new OProcess();
63 hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); 63 m_hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
64 *hcitool << "hcitool" << "scan"; 64 *m_hcitool << "hcitool" << "scan";
65 connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , 65 connect( m_hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
66 this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) ); 66 this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) );
67 connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), 67 connect( m_hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
68 this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); 68 this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
69 if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { 69 if (!m_hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
70 odebug << "Manager: could not start" << oendl; 70 odebug << "Manager: could not start" << oendl;
@@ -72,3 +72,4 @@ void Manager::searchDevices( const QString& device ){
72 emit foundDevices( device, list ); 72 emit foundDevices( device, list );
73 delete hcitool; 73 delete m_hcitool;
74 m_hcitool = 0;
74 } 75 }
@@ -107,3 +108,3 @@ void Manager::removeServices( const QStringList& list){
107void Manager::searchServices( const QString& remDevice ){ 108void Manager::searchServices( const QString& remDevice ){
108 OProcess *m_sdp =new OProcess(); 109 m_sdp =new OProcess();
109 *m_sdp << "sdptool" << "browse" << remDevice; 110 *m_sdp << "sdptool" << "browse" << remDevice;
@@ -118,2 +119,3 @@ void Manager::searchServices( const QString& remDevice ){
118 delete m_sdp; 119 delete m_sdp;
120 m_sdp = 0;
119 Services::ValueList list; 121 Services::ValueList list;
@@ -167,2 +169,4 @@ void Manager::slotSDPExited( OProcess* proc)
167 emit foundServices( proc->name(), list ); 169 emit foundServices( proc->name(), list );
170 if (proc == m_sdp)
171 m_sdp = 0;
168 delete proc; 172 delete proc;
@@ -190,2 +194,4 @@ void Manager::slotHCIExited(OProcess* proc ) {
190 emit foundDevices( proc->name(), list ); 194 emit foundDevices( proc->name(), list );
195 if (proc == m_hcitool)
196 m_hcitool = 0;
191 delete proc; 197 delete proc;