summaryrefslogtreecommitdiff
path: root/core/obex/obexsend.cpp
Unidiff
Diffstat (limited to 'core/obex/obexsend.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/obex/obexsend.cpp45
1 files changed, 42 insertions, 3 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 45754e3..d58b4e9 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -5,8 +5,12 @@
5 5
6#include "obex.h" 6#include "obex.h"
7#ifdef BLUETOOTH
7#include "btobex.h" 8#include "btobex.h"
9#endif
8#include "obexsend.h" 10#include "obexsend.h"
9using namespace OpieObex; 11using namespace OpieObex;
12#ifdef BLUETOOTH
10using namespace OpieTooth; 13using namespace OpieTooth;
14#endif
11 15
12/* OPIE */ 16/* OPIE */
@@ -15,6 +19,8 @@ using namespace OpieTooth;
15#include <opie2/oresource.h> 19#include <opie2/oresource.h>
16#include <qpe/version.h> 20#include <qpe/version.h>
21#ifdef BLUETOOTH
17#include <devicehandler.h> 22#include <devicehandler.h>
18#include "remotedevice.h" 23#include "remotedevice.h"
24#endif
19 25
20using namespace Opie::Core; 26using namespace Opie::Core;
@@ -53,4 +59,5 @@ void SendWidget::initUI() {
53 this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) ); 59 this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) );
54 60
61#ifdef BLUETOOTH
55 m_btobex = new BtObex(this, "btobex"); 62 m_btobex = new BtObex(this, "btobex");
56 connect(m_btobex, SIGNAL(error(int) ), 63 connect(m_btobex, SIGNAL(error(int) ),
@@ -64,5 +71,5 @@ void SendWidget::initUI() {
64 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), 71 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
65 this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) ); 72 this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
66 73#endif
67} 74}
68 75
@@ -74,5 +81,7 @@ void SendWidget::send( const QString& file, const QString& desc ) {
74 m_file = file; 81 m_file = file;
75 m_irDa.clear(); 82 m_irDa.clear();
83#ifdef BLUETOOTH
76 m_bt.clear(); 84 m_bt.clear();
85#endif
77 m_start = 0; 86 m_start = 0;
78 87
@@ -89,4 +98,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
89 sendButton->setEnabled( true ); 98 sendButton->setEnabled( true );
90 } 99 }
100#ifdef BLUETOOTH
91 if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) 101 if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
92 { 102 {
@@ -100,4 +110,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
100 } 110 }
101 read_receivers(); 111 read_receivers();
112#endif
102} 113}
103 114
@@ -135,4 +146,5 @@ void SendWidget::slotIrDaDevices( const QStringList& list) {
135 146
136void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { 147void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
148#ifdef BLUETOOTH
137 for(QMap<QString, QString>::ConstIterator it = str.begin(); 149 for(QMap<QString, QString>::ConstIterator it = str.begin();
138 it != str.end(); ++it ) { 150 it != str.end(); ++it ) {
@@ -143,4 +155,7 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
143 m_btIt = m_bt.begin(); 155 m_btIt = m_bt.begin();
144 156
157#else
158 (void)str;
159#endif
145} 160}
146void SendWidget::slotSelectedDevice( int, int ) { 161void SendWidget::slotSelectedDevice( int, int ) {
@@ -164,8 +179,12 @@ void SendWidget::slotIrError( int ) {
164} 179}
165void SendWidget::slotIrSent( bool b) { 180void SendWidget::slotIrSent( bool b) {
181#ifdef BLUETOOTH
166 QString text = b ? tr("Sent") : tr("Failure"); 182 QString text = b ? tr("Sent") : tr("Failure");
167 setReceiverStatus( m_irDaIt.key(), text ); 183 setReceiverStatus( m_irDaIt.key(), text );
168 ++m_irDaIt; 184 ++m_irDaIt;
169 slotStartIrda(); 185 slotStartIrda();
186#else
187 (void)b;
188#endif
170} 189}
171void SendWidget::slotIrTry(unsigned int trI) { 190void SendWidget::slotIrTry(unsigned int trI) {
@@ -197,13 +216,22 @@ void SendWidget::slotBtError( int ) {
197} 216}
198void SendWidget::slotBtSent( bool b) { 217void SendWidget::slotBtSent( bool b) {
218#ifdef BLUETOOTH
199 QString text = b ? tr("Sent") : tr("Failure"); 219 QString text = b ? tr("Sent") : tr("Failure");
200 setReceiverStatus( m_btIt.key(), text ); 220 setReceiverStatus( m_btIt.key(), text );
201 ++m_btIt; 221 ++m_btIt;
202 slotStartBt(); 222 slotStartBt();
223#else
224 (void)b;
225#endif
203} 226}
204void SendWidget::slotBtTry(unsigned int trI) { 227void SendWidget::slotBtTry(unsigned int trI) {
228#ifdef BLUETOOTH
205 setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); 229 setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
230#else
231 (void)trI;
232#endif
206} 233}
207void SendWidget::slotStartBt() { 234void SendWidget::slotStartBt() {
235#ifdef BLUETOOTH
208 // skip past unselected receivers 236 // skip past unselected receivers
209 if ( !m_bt.count() ) 237 if ( !m_bt.count() )
@@ -219,11 +247,15 @@ void SendWidget::slotStartBt() {
219 btStatus->setText(tr("sending.")); 247 btStatus->setText(tr("sending."));
220 m_btobex->send( m_file, m_btIt.data().second() ); 248 m_btobex->send( m_file, m_btIt.data().second() );
249#endif
221} 250}
222 251
223void SendWidget::send_to_receivers() { 252void SendWidget::send_to_receivers() {
253#ifdef BLUETOOTH
224 slotStartBt(); 254 slotStartBt();
255#endif
225 slotStartIrda(); 256 slotStartIrda();
226} 257}
227 258
259#ifdef BLUETOOTH
228/** 260/**
229 * Read receivers saved by bluetooth manager 261 * Read receivers saved by bluetooth manager
@@ -254,5 +286,5 @@ void SendWidget::read_receivers()
254 } 286 }
255} 287}
256 288#endif
257 289
258void SendWidget::scan_for_receivers() 290void SendWidget::scan_for_receivers()
@@ -262,6 +294,7 @@ void SendWidget::scan_for_receivers()
262 receivers.clear(); 294 receivers.clear();
263 m_irDa.clear(); 295 m_irDa.clear();
296#ifdef BLUETOOTH
264 m_bt.clear(); 297 m_bt.clear();
265 298#endif
266 if ( QCopChannel::isRegistered("QPE/IrDaApplet") ) 299 if ( QCopChannel::isRegistered("QPE/IrDaApplet") )
267 { 300 {
@@ -271,4 +304,5 @@ void SendWidget::scan_for_receivers()
271 } 304 }
272 305
306#ifdef BLUETOOTH
273 if ( QCopChannel::isRegistered("QPE/Bluetooth") ) 307 if ( QCopChannel::isRegistered("QPE/Bluetooth") )
274 { 308 {
@@ -277,4 +311,5 @@ void SendWidget::scan_for_receivers()
277 QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); 311 QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
278 } 312 }
313#endif
279} 314}
280 315
@@ -294,13 +329,17 @@ void SendWidget::closeEvent( QCloseEvent* evt) {
294 delete m_obex; 329 delete m_obex;
295 m_obex = NULL; 330 m_obex = NULL;
331#ifdef BLUETOOTH
296 delete m_btobex; 332 delete m_btobex;
297 m_btobex = NULL; 333 m_btobex = NULL;
334#endif
298 obexSendBase::closeEvent(evt); 335 obexSendBase::closeEvent(evt);
299 { 336 {
300 QCopEnvelope e("QPE/IrDaApplet", "disableIrda()"); 337 QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
301 } 338 }
339#ifdef BLUETOOTH
302 { 340 {
303 QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()"); 341 QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
304 } 342 }
343#endif
305} 344}
306 345