summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-12-03 14:09:33 (UTC)
committer korovkin <korovkin>2006-12-03 14:09:33 (UTC)
commita691909050b60b94f5525093062c23d0fab11d1b (patch) (unidiff)
tree1e1d82e76d85cd75c094ae36441ec852bb5ac456
parent9813113f0024205e09af9e54328287dd859fa2e8 (diff)
downloadopie-a691909050b60b94f5525093062c23d0fab11d1b.zip
opie-a691909050b60b94f5525093062c23d0fab11d1b.tar.gz
opie-a691909050b60b94f5525093062c23d0fab11d1b.tar.bz2
Made OBEX library buildable if bluetooth support is disabled.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/btobex.h3
-rw-r--r--core/obex/obex.pro10
-rw-r--r--core/obex/obexsend.cpp45
-rw-r--r--core/obex/obexsend.h9
-rw-r--r--core/obex/receiver.cpp2
5 files changed, 62 insertions, 7 deletions
diff --git a/core/obex/btobex.h b/core/obex/btobex.h
index 7e91c06..d9bd886 100644
--- a/core/obex/btobex.h
+++ b/core/obex/btobex.h
@@ -32,6 +32,7 @@
32 32
33#ifndef OpieBtObex_H 33#ifndef OpieBtObex_H
34#define OpieBtObex_H 34#define OpieBtObex_H
35#ifdef BLUETOOTH
35 36
36#include "obexbase.h" 37#include "obexbase.h"
37#include <qobject.h> 38#include <qobject.h>
@@ -114,5 +115,5 @@ private slots:
114 }; 115 };
115}; 116};
116 117
117 118#endif //BLUETOOTH
118#endif 119#endif
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 1fc6958..05118ab 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,7 +1,7 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 HEADERS= obex.h btobex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h 3 HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h
4 SOURCES= obex.cpp btobex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp 4 SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp
5 TARGET = opieobex 5 TARGET = opieobex
6 DESTDIR = $(OPIEDIR)/plugins/obex 6 DESTDIR = $(OPIEDIR)/plugins/obex
7INTERFACES = obexsendbase.ui 7INTERFACES = obexsendbase.ui
@@ -14,7 +14,11 @@ include( $(OPIEDIR)/include.pro )
14target.path = $$prefix/plugins/applets 14target.path = $$prefix/plugins/applets
15 15
16#FIXME: These parameters are used if bluetooth is used 16#FIXME: These parameters are used if bluetooth is used
17CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
18contains( CONFTEST, y ){
19HEADERS += btobex.h
20SOURCES += btobex.cpp
17INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
18LIBS += -lopietooth1 -lbluetooth -lopenobex 22LIBS += -lopietooth1 -lbluetooth -lopenobex
19DEFINES += BLUETOOTH 23DEFINES += BLUETOOTH
20 24}
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
@@ -4,18 +4,24 @@
4// all. 4// all.
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 */
13#include <opie2/odebug.h> 17#include <opie2/odebug.h>
14#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
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;
21 27
@@ -52,6 +58,7 @@ void SendWidget::initUI() {
52 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), 58 connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
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) ),
57 this, SLOT(slotBtError(int) ) ); 64 this, SLOT(slotBtError(int) ) );
@@ -63,7 +70,7 @@ void SendWidget::initUI() {
63 chan = new QCopChannel("QPE/BluetoothBack", this ); 70 chan = new QCopChannel("QPE/BluetoothBack", this );
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
69/* 76/*
@@ -73,7 +80,9 @@ void SendWidget::initUI() {
73void SendWidget::send( const QString& file, const QString& desc ) { 80void 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
79 fileToSend->setText(desc.isEmpty() ? file : desc ); 88 fileToSend->setText(desc.isEmpty() ? file : desc );
@@ -88,6 +97,7 @@ void SendWidget::send( const QString& file, const QString& desc ) {
88 irdaStatus->setText(tr("ready")); 97 irdaStatus->setText(tr("ready"));
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 {
93 btStatus->setText(tr("not enabled.")); 103 btStatus->setText(tr("not enabled."));
@@ -99,6 +109,7 @@ void SendWidget::send( const QString& file, const QString& desc ) {
99 sendButton->setEnabled( true ); 109 sendButton->setEnabled( true );
100 } 110 }
101 read_receivers(); 111 read_receivers();
112#endif
102} 113}
103 114
104int SendWidget::addReceiver(const QString& str, const char *icon) 115int SendWidget::addReceiver(const QString& str, const char *icon)
@@ -134,6 +145,7 @@ void SendWidget::slotIrDaDevices( const QStringList& list) {
134} 145}
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 ) {
139 int id = addReceiver(it.key(), "obex/bt.png"); 151 int id = addReceiver(it.key(), "obex/bt.png");
@@ -142,6 +154,9 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
142 btStatus->setText(tr("ready.")); 154 btStatus->setText(tr("ready."));
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 ) {
147/* if ( name == m_irDeSearch ) { 162/* if ( name == m_irDeSearch ) {
@@ -163,10 +178,14 @@ void SendWidget::slotIrError( int ) {
163 irdaStatus->setText(tr("error :(")); 178 irdaStatus->setText(tr("error :("));
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) {
172 setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); 191 setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
@@ -196,15 +215,24 @@ void SendWidget::slotBtError( int ) {
196 btStatus->setText(tr("error :(")); 215 btStatus->setText(tr("error :("));
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() )
210 return; 238 return;
@@ -218,13 +246,17 @@ void SendWidget::slotStartBt() {
218 setReceiverStatus( m_btIt.key(), tr("Start sending") ); 246 setReceiverStatus( m_btIt.key(), tr("Start sending") );
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
230 */ 262 */
@@ -253,7 +285,7 @@ void SendWidget::read_receivers()
253 sendButton->setEnabled( true ); 285 sendButton->setEnabled( true );
254 } 286 }
255} 287}
256 288#endif
257 289
258void SendWidget::scan_for_receivers() 290void SendWidget::scan_for_receivers()
259{ 291{
@@ -261,8 +293,9 @@ void SendWidget::scan_for_receivers()
261 receiverList->clear(); 293 receiverList->clear();
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 {
268 irdaStatus->setText(tr("searching...")); 301 irdaStatus->setText(tr("searching..."));
@@ -270,12 +303,14 @@ void SendWidget::scan_for_receivers()
270 QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); 303 QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
271 } 304 }
272 305
306#ifdef BLUETOOTH
273 if ( QCopChannel::isRegistered("QPE/Bluetooth") ) 307 if ( QCopChannel::isRegistered("QPE/Bluetooth") )
274 { 308 {
275 btStatus->setText(tr("searching...")); 309 btStatus->setText(tr("searching..."));
276 sendButton->setEnabled( true ); 310 sendButton->setEnabled( true );
277 QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); 311 QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
278 } 312 }
313#endif
279} 314}
280 315
281void SendWidget::toggle_receiver(QListViewItem* item) 316void SendWidget::toggle_receiver(QListViewItem* item)
@@ -293,15 +328,19 @@ void SendWidget::toggle_receiver(QListViewItem* item)
293void SendWidget::closeEvent( QCloseEvent* evt) { 328void 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
307void SendWidget::userDone() { 346void SendWidget::userDone() {
diff --git a/core/obex/obexsend.h b/core/obex/obexsend.h
index f9ba340..cc27354 100644
--- a/core/obex/obexsend.h
+++ b/core/obex/obexsend.h
@@ -21,7 +21,9 @@ class QVBoxLayout;
21 */ 21 */
22namespace OpieObex { 22namespace OpieObex {
23 class Obex; 23 class Obex;
24#ifdef BLUETOOTH
24 class BtObex; 25 class BtObex;
26#endif
25 27
26 struct Pair { 28 struct Pair {
27 Pair(const QString& first = QString::null, 29 Pair(const QString& first = QString::null,
@@ -44,7 +46,9 @@ namespace OpieObex {
44 46
45 protected: 47 protected:
46 void closeEvent( QCloseEvent* ); 48 void closeEvent( QCloseEvent* );
49#ifdef BLUETOOTH
47 void read_receivers(); 50 void read_receivers();
51#endif
48 52
49 public slots: 53 public slots:
50 void send( const QString& file, const QString& desc ); 54 void send( const QString& file, const QString& desc );
@@ -63,6 +67,7 @@ namespace OpieObex {
63 void slotIrDaDevices( const QStringList& ); 67 void slotIrDaDevices( const QStringList& );
64 /* Bt Names + BD-Addr */ 68 /* Bt Names + BD-Addr */
65 void slotBTDevices( const QMap<QString, QString>& ); 69 void slotBTDevices( const QMap<QString, QString>& );
70
66 void slotSelectedDevice( int id, int dev ); 71 void slotSelectedDevice( int id, int dev );
67 72
68 void dispatchIrda( const QCString& str, const QByteArray& ar ); 73 void dispatchIrda( const QCString& str, const QByteArray& ar );
@@ -87,12 +92,16 @@ namespace OpieObex {
87 int m_start; 92 int m_start;
88 QMap<int, QString> m_irDa; 93 QMap<int, QString> m_irDa;
89 QMap<int, QString>::Iterator m_irDaIt; 94 QMap<int, QString>::Iterator m_irDaIt;
95#ifdef BLUETOOTH
90 QMap<int, Pair > m_bt; 96 QMap<int, Pair > m_bt;
91 QMap<int, Pair>::Iterator m_btIt; 97 QMap<int, Pair>::Iterator m_btIt;
98#endif
92 QMap<int, QListViewItem *> receivers; 99 QMap<int, QListViewItem *> receivers;
93 QString m_file; 100 QString m_file;
94 Obex* m_obex; 101 Obex* m_obex;
102#ifdef BLUETOOTH
95 BtObex* m_btobex; 103 BtObex* m_btobex;
104#endif
96 }; 105 };
97} 106}
98 107
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index e153152..3190353 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -31,8 +31,10 @@ using namespace Opie::Core;
31Receiver::Receiver(RecType type) { 31Receiver::Receiver(RecType type) {
32 if (type == REC_IRDA) 32 if (type == REC_IRDA)
33 m_obex = new Obex(this, "Receiver"); 33 m_obex = new Obex(this, "Receiver");
34#ifdef BLUETOOTH
34 else 35 else
35 m_obex = new BtObex(this, "Receiver"); 36 m_obex = new BtObex(this, "Receiver");
37#endif
36 connect(m_obex, SIGNAL(receivedFile(const QString&) ), 38 connect(m_obex, SIGNAL(receivedFile(const QString&) ),
37 this, SLOT(slotReceived(const QString&) ) ); 39 this, SLOT(slotReceived(const QString&) ) );
38 m_obex->receive(); 40 m_obex->receive();