author | korovkin <korovkin> | 2006-05-02 19:48:56 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-05-02 19:48:56 (UTC) |
commit | 1240155cf5865df0d0ce0e4bd04dfec68ec1ede5 (patch) (side-by-side diff) | |
tree | 5b02700cd155920820712a9033cafe5ea60d6a30 /noncore/net/opietooth/lib/manager.cc | |
parent | c1299012f67f2ae99a4f83445692afbe9244a676 (diff) | |
download | opie-1240155cf5865df0d0ce0e4bd04dfec68ec1ede5.zip opie-1240155cf5865df0d0ce0e4bd04dfec68ec1ede5.tar.gz opie-1240155cf5865df0d0ce0e4bd04dfec68ec1ede5.tar.bz2 |
Destroy process on an object destruction.
Diffstat (limited to 'noncore/net/opietooth/lib/manager.cc') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 22 |
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 @@ -56,24 +56,25 @@ void Manager::isAvailable( const QString& device ){ void Manager::isAvailable( Device* /*dev*/ ){ } void Manager::searchDevices( const QString& device ){ odebug << "Manager: search devices" << oendl; - OProcess* hcitool = new OProcess(); - hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); - *hcitool << "hcitool" << "scan"; - connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , + m_hcitool = new OProcess(); + m_hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); + *m_hcitool << "hcitool" << "scan"; + connect( m_hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) ); - connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), + connect( m_hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); - if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { + if (!m_hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { odebug << "Manager: could not start" << oendl; RemoteDevice::ValueList list; emit foundDevices( device, list ); - delete hcitool; + delete m_hcitool; + m_hcitool = 0; } } void Manager::searchDevices(Device* /*d*/ ){ @@ -102,23 +103,24 @@ void Manager::removeService( const QString& name ){ void Manager::removeServices( const QStringList& list){ QStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it ) removeService( (*it) ); } void Manager::searchServices( const QString& remDevice ){ - OProcess *m_sdp =new OProcess(); + m_sdp =new OProcess(); *m_sdp << "sdptool" << "browse" << remDevice; m_sdp->setName( remDevice.latin1() ); odebug << "Manager: search Services for " << remDevice.latin1() << oendl; connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { odebug << "Manager: could not start sdptool" << oendl; delete m_sdp; + m_sdp = 0; Services::ValueList list; emit foundServices( remDevice, list ); } } void Manager::searchServices( const RemoteDevice& dev){ searchServices( dev.mac() ); @@ -162,12 +164,14 @@ void Manager::slotSDPExited( OProcess* proc) odebug << "Manager: found process" << oendl; list = parseSDPOutput( it.data() ); m_out.remove( it ); } } emit foundServices( proc->name(), list ); + if (proc == m_sdp) + m_sdp = 0; delete proc; } Services::ValueList Manager::parseSDPOutput( const QString& out ) { Services::ValueList list; odebug << "Manager: parsing output" << oendl; Parser parser( out ); @@ -185,12 +189,14 @@ void Manager::slotHCIExited(OProcess* proc ) { odebug << "Manager: != end ;)" << oendl; list = parseHCIOutput( it.data() ); m_devices.remove( it ); } } emit foundDevices( proc->name(), list ); + if (proc == m_hcitool) + m_hcitool = 0; delete proc; } void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { QCString str( ch, len+1 ); odebug << "Manager: hci: " << str.data() << oendl; QMap<QString, QString>::Iterator it; |