-rw-r--r-- | core/obex/obexsend.cpp | 45 |
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 | |||
@@ -6,6 +6,10 @@ | |||
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" |
9 | using namespace OpieObex; | 11 | using namespace OpieObex; |
12 | #ifdef BLUETOOTH | ||
10 | using namespace OpieTooth; | 13 | using namespace OpieTooth; |
14 | #endif | ||
11 | 15 | ||
@@ -16,4 +20,6 @@ using namespace OpieTooth; | |||
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 | ||
@@ -54,2 +60,3 @@ void SendWidget::initUI() { | |||
54 | 60 | ||
61 | #ifdef BLUETOOTH | ||
55 | m_btobex = new BtObex(this, "btobex"); | 62 | m_btobex = new BtObex(this, "btobex"); |
@@ -65,3 +72,3 @@ void SendWidget::initUI() { | |||
65 | this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) ); | 72 | this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) ); |
66 | 73 | #endif | |
67 | } | 74 | } |
@@ -75,3 +82,5 @@ void SendWidget::send( const QString& file, const QString& desc ) { | |||
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; |
@@ -90,2 +99,3 @@ void SendWidget::send( const QString& file, const QString& desc ) { | |||
90 | } | 99 | } |
100 | #ifdef BLUETOOTH | ||
91 | if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) | 101 | if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) |
@@ -101,2 +111,3 @@ void SendWidget::send( const QString& file, const QString& desc ) { | |||
101 | read_receivers(); | 111 | read_receivers(); |
112 | #endif | ||
102 | } | 113 | } |
@@ -136,2 +147,3 @@ void SendWidget::slotIrDaDevices( const QStringList& list) { | |||
136 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | 147 | void 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(); |
@@ -144,2 +156,5 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | |||
144 | 156 | ||
157 | #else | ||
158 | (void)str; | ||
159 | #endif | ||
145 | } | 160 | } |
@@ -165,2 +180,3 @@ void SendWidget::slotIrError( int ) { | |||
165 | void SendWidget::slotIrSent( bool b) { | 180 | void SendWidget::slotIrSent( bool b) { |
181 | #ifdef BLUETOOTH | ||
166 | QString text = b ? tr("Sent") : tr("Failure"); | 182 | QString text = b ? tr("Sent") : tr("Failure"); |
@@ -169,2 +185,5 @@ void SendWidget::slotIrSent( bool b) { | |||
169 | slotStartIrda(); | 185 | slotStartIrda(); |
186 | #else | ||
187 | (void)b; | ||
188 | #endif | ||
170 | } | 189 | } |
@@ -198,2 +217,3 @@ void SendWidget::slotBtError( int ) { | |||
198 | void SendWidget::slotBtSent( bool b) { | 217 | void SendWidget::slotBtSent( bool b) { |
218 | #ifdef BLUETOOTH | ||
199 | QString text = b ? tr("Sent") : tr("Failure"); | 219 | QString text = b ? tr("Sent") : tr("Failure"); |
@@ -202,7 +222,15 @@ void SendWidget::slotBtSent( bool b) { | |||
202 | slotStartBt(); | 222 | slotStartBt(); |
223 | #else | ||
224 | (void)b; | ||
225 | #endif | ||
203 | } | 226 | } |
204 | void SendWidget::slotBtTry(unsigned int trI) { | 227 | void 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 | } |
207 | void SendWidget::slotStartBt() { | 234 | void SendWidget::slotStartBt() { |
235 | #ifdef BLUETOOTH | ||
208 | // skip past unselected receivers | 236 | // skip past unselected receivers |
@@ -220,2 +248,3 @@ void SendWidget::slotStartBt() { | |||
220 | m_btobex->send( m_file, m_btIt.data().second() ); | 248 | m_btobex->send( m_file, m_btIt.data().second() ); |
249 | #endif | ||
221 | } | 250 | } |
@@ -223,3 +252,5 @@ void SendWidget::slotStartBt() { | |||
223 | void SendWidget::send_to_receivers() { | 252 | void SendWidget::send_to_receivers() { |
253 | #ifdef BLUETOOTH | ||
224 | slotStartBt(); | 254 | slotStartBt(); |
255 | #endif | ||
225 | slotStartIrda(); | 256 | slotStartIrda(); |
@@ -227,2 +258,3 @@ void SendWidget::send_to_receivers() { | |||
227 | 258 | ||
259 | #ifdef BLUETOOTH | ||
228 | /** | 260 | /** |
@@ -255,3 +287,3 @@ void SendWidget::read_receivers() | |||
255 | } | 287 | } |
256 | 288 | #endif | |
257 | 289 | ||
@@ -263,4 +295,5 @@ void SendWidget::scan_for_receivers() | |||
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") ) |
@@ -272,2 +305,3 @@ void SendWidget::scan_for_receivers() | |||
272 | 305 | ||
306 | #ifdef BLUETOOTH | ||
273 | if ( QCopChannel::isRegistered("QPE/Bluetooth") ) | 307 | if ( QCopChannel::isRegistered("QPE/Bluetooth") ) |
@@ -278,2 +312,3 @@ void SendWidget::scan_for_receivers() | |||
278 | } | 312 | } |
313 | #endif | ||
279 | } | 314 | } |
@@ -295,4 +330,6 @@ void SendWidget::closeEvent( QCloseEvent* evt) { | |||
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); |
@@ -301,2 +338,3 @@ void SendWidget::closeEvent( QCloseEvent* evt) { | |||
301 | } | 338 | } |
339 | #ifdef BLUETOOTH | ||
302 | { | 340 | { |
@@ -304,2 +342,3 @@ void SendWidget::closeEvent( QCloseEvent* evt) { | |||
304 | } | 342 | } |
343 | #endif | ||
305 | } | 344 | } |