author | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
commit | b5d4d3425bc7f9d2518a15159f4a7b01071a68d7 (patch) (unidiff) | |
tree | 2cb1b9f7051cd06123c36eb8b75a9b6b7e49db0f | |
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 | |||
@@ -36,4 +36,3 @@ BtObex::BtObex( QObject *parent, const char* name ) | |||
36 | BtObex::~BtObex() { | 36 | BtObex::~BtObex() { |
37 | if (btManager) | 37 | delete btManager; |
38 | delete btManager; | ||
39 | delete m_rec; | 38 | delete m_rec; |
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 | |||
@@ -94,5 +94,6 @@ void SendWidget::setReceiverStatus( int id, const QString& status ) { | |||
94 | void SendWidget::slotIrDaDevices( const QStringList& list) { | 94 | void SendWidget::slotIrDaDevices( const QStringList& list) { |
95 | for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 95 | for (QStringList::ConstIterator it = list.begin(); |
96 | int id = addReceiver(*it, "obex/irda.png"); | 96 | it != list.end(); ++it ) { |
97 | m_irDa.insert( id, (*it) ); | 97 | int id = addReceiver(*it, "obex/irda.png"); |
98 | m_irDa.insert( id, (*it) ); | ||
98 | } | 99 | } |
@@ -104,4 +105,5 @@ void SendWidget::slotIrDaDevices( const QStringList& list) { | |||
104 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | 105 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { |
105 | for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { | 106 | for(QMap<QString, QString>::ConstIterator it = str.begin(); |
106 | int id = addReceiver(it.key(), "obex/bt.png"); | 107 | it != str.end(); ++it ) { |
108 | int id = addReceiver(it.key(), "obex/bt.png"); | ||
107 | m_bt.insert( id, Pair( it.key(), it.data() ) ); | 109 | m_bt.insert( id, Pair( it.key(), it.data() ) ); |
@@ -141,4 +143,5 @@ void SendWidget::slotIrTry(unsigned int trI) { | |||
141 | void SendWidget::slotStartIrda() { | 143 | void SendWidget::slotStartIrda() { |
142 | if ( !m_irDa.count() ) return; | 144 | if ( !m_irDa.count() ) |
143 | if ( m_irDaIt == m_irDa.end() ) { | 145 | return; |
146 | if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { | ||
144 | irdaStatus->setText(tr("complete.")); | 147 | irdaStatus->setText(tr("complete.")); |
@@ -153,3 +156,3 @@ void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { | |||
153 | QDataStream stream( ar, IO_ReadOnly ); | 156 | QDataStream stream( ar, IO_ReadOnly ); |
154 | QMap<QString, QString> btmap; | 157 | QMap<QString, QString> btmap; |
155 | stream >> btmap; | 158 | stream >> btmap; |
@@ -173,3 +176,3 @@ void SendWidget::slotStartBt() { | |||
173 | while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) | 176 | while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) |
174 | ++m_btIt; | 177 | ++m_btIt; |
175 | if (m_btIt == m_bt.end() ) { | 178 | if (m_btIt == m_bt.end() ) { |
@@ -224,3 +227,3 @@ void SendWidget::toggle_receiver(QListViewItem* item) | |||
224 | else | 227 | else |
225 | item->setPixmap(2,Resource::loadPixmap("backup/check.png")); | 228 | item->setPixmap(2,Resource::loadPixmap("obex/check.png")); |
226 | } | 229 | } |
@@ -228,6 +231,14 @@ void SendWidget::toggle_receiver(QListViewItem* item) | |||
228 | 231 | ||
229 | void SendWidget::closeEvent( QCloseEvent* e) { | 232 | void SendWidget::closeEvent( QCloseEvent* evt) { |
230 | obexSendBase::closeEvent(e); | 233 | delete m_obex; |
231 | QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); | 234 | m_obex = NULL; |
232 | QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()"); | 235 | delete m_btobex; |
236 | m_btobex = NULL; | ||
237 | obexSendBase::closeEvent(evt); | ||
238 | { | ||
239 | QCopEnvelope e("QPE/IrDaApplet", "disableIrda()"); | ||
240 | } | ||
241 | { | ||
242 | QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()"); | ||
243 | } | ||
233 | } | 244 | } |