author | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
commit | b5d4d3425bc7f9d2518a15159f4a7b01071a68d7 (patch) (side-by-side diff) | |
tree | 2cb1b9f7051cd06123c36eb8b75a9b6b7e49db0f /core/obex | |
parent | 9e9148941974ce65fb733b14dd8bb15fe099ec2c (diff) | |
download | opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.zip opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.tar.gz opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.tar.bz2 |
destroys all child processes on the window closure. patch courtesy Dmitriy Korovkin
-rw-r--r-- | core/obex/btobex.cpp | 3 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 39 |
2 files changed, 26 insertions, 16 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index b8556da..886f3dc 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp @@ -29,18 +29,17 @@ BtObex::BtObex( QObject *parent, const char* name ) connect( this, SIGNAL(error(int) ), // for recovering to receive SLOT(slotError() ) ); connect( this, SIGNAL(sent(bool) ), SLOT(slotError() ) ); btManager = NULL; }; BtObex::~BtObex() { - if (btManager) - delete btManager; + delete btManager; delete m_rec; delete m_send; } void BtObex::receive() { m_receive = true; m_outp = QString::null; m_rec = new OProcess(); diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index dbbb7b3..8432d16 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp @@ -87,28 +87,30 @@ bool SendWidget::receiverSelected(int id) } void SendWidget::setReceiverStatus( int id, const QString& status ) { if ( !receivers.contains(id) ) return; receivers[id]->setText(3, status ); } void SendWidget::slotIrDaDevices( const QStringList& list) { - for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - int id = addReceiver(*it, "obex/irda.png"); - m_irDa.insert( id, (*it) ); + for (QStringList::ConstIterator it = list.begin(); + it != list.end(); ++it ) { + int id = addReceiver(*it, "obex/irda.png"); + m_irDa.insert( id, (*it) ); } irdaStatus->setText( tr("ready.")); m_irDaIt = m_irDa.begin(); } void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { - for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { - int id = addReceiver(it.key(), "obex/bt.png"); + for(QMap<QString, QString>::ConstIterator it = str.begin(); + it != str.end(); ++it ) { + int id = addReceiver(it.key(), "obex/bt.png"); m_bt.insert( id, Pair( it.key(), it.data() ) ); } btStatus->setText(tr("ready.")); m_btIt = m_bt.begin(); } void SendWidget::slotSelectedDevice( int, int ) { /* if ( name == m_irDeSearch ) { @@ -134,29 +136,30 @@ void SendWidget::slotIrSent( bool b) { setReceiverStatus( m_irDaIt.key(), text ); ++m_irDaIt; slotStartIrda(); } void SendWidget::slotIrTry(unsigned int trI) { setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); } void SendWidget::slotStartIrda() { - if ( !m_irDa.count() ) return; - if ( m_irDaIt == m_irDa.end() ) { + if ( !m_irDa.count() ) + return; + if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { irdaStatus->setText(tr("complete.")); return; } setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); m_obex->send( m_file ); } void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { if ( str == "devices(QStringMap)" ) { QDataStream stream( ar, IO_ReadOnly ); - QMap<QString, QString> btmap; + QMap<QString, QString> btmap; stream >> btmap; slotBTDevices( btmap ); } } void SendWidget::slotBtError( int ) { btStatus->setText(tr("error :(")); } void SendWidget::slotBtSent( bool b) { @@ -166,17 +169,17 @@ void SendWidget::slotBtSent( bool b) { slotStartBt(); } void SendWidget::slotBtTry(unsigned int trI) { setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); } void SendWidget::slotStartBt() { // skip past unselected receivers while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) - ++m_btIt; + ++m_btIt; if (m_btIt == m_bt.end() ) { btStatus->setText(tr("complete.")); return; } setReceiverStatus( m_btIt.key(), tr("Start sending") ); m_btobex->send( m_file, m_btIt.data().second() ); } @@ -217,24 +220,32 @@ void SendWidget::scan_for_receivers() } void SendWidget::toggle_receiver(QListViewItem* item) { // toggle the state of an individual receiver. if(item->pixmap(2)) item->setPixmap(2,QPixmap()); else - item->setPixmap(2,Resource::loadPixmap("backup/check.png")); + item->setPixmap(2,Resource::loadPixmap("obex/check.png")); } -void SendWidget::closeEvent( QCloseEvent* e) { - obexSendBase::closeEvent(e); - QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); - QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()"); +void SendWidget::closeEvent( QCloseEvent* evt) { + delete m_obex; + m_obex = NULL; + delete m_btobex; + m_btobex = NULL; + obexSendBase::closeEvent(evt); + { + QCopEnvelope e("QPE/IrDaApplet", "disableIrda()"); + } + { + QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()"); + } } void SendWidget::userDone() { close(); } QString SendWidget::file()const { return m_file; |