author | korovkin <korovkin> | 2006-12-03 14:09:33 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-12-03 14:09:33 (UTC) |
commit | a691909050b60b94f5525093062c23d0fab11d1b (patch) (unidiff) | |
tree | 1e1d82e76d85cd75c094ae36441ec852bb5ac456 | |
parent | 9813113f0024205e09af9e54328287dd859fa2e8 (diff) | |
download | opie-a691909050b60b94f5525093062c23d0fab11d1b.zip opie-a691909050b60b94f5525093062c23d0fab11d1b.tar.gz opie-a691909050b60b94f5525093062c23d0fab11d1b.tar.bz2 |
Made OBEX library buildable if bluetooth support is disabled.
-rw-r--r-- | core/obex/btobex.h | 3 | ||||
-rw-r--r-- | core/obex/obex.pro | 10 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 45 | ||||
-rw-r--r-- | core/obex/obexsend.h | 9 | ||||
-rw-r--r-- | core/obex/receiver.cpp | 2 |
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 | |||
@@ -33,4 +33,5 @@ | |||
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" |
@@ -115,4 +116,4 @@ private slots: | |||
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,6 +1,6 @@ | |||
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 |
@@ -15,6 +15,10 @@ target.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 |
17 | CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) | ||
18 | contains( CONFTEST, y ){ | ||
19 | HEADERS += btobex.h | ||
20 | SOURCES += btobex.cpp | ||
17 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
18 | LIBS += -lopietooth1 -lbluetooth -lopenobex | 22 | LIBS += -lopietooth1 -lbluetooth -lopenobex |
19 | DEFINES += BLUETOOTH | 23 | DEFINES += 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 | |||
@@ -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" |
9 | using namespace OpieObex; | 11 | using namespace OpieObex; |
12 | #ifdef BLUETOOTH | ||
10 | using namespace OpieTooth; | 13 | using 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 | ||
20 | using namespace Opie::Core; | 26 | using 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 | ||
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(); |
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 | } |
146 | void SendWidget::slotSelectedDevice( int, int ) { | 161 | void SendWidget::slotSelectedDevice( int, int ) { |
@@ -164,8 +179,12 @@ void SendWidget::slotIrError( int ) { | |||
164 | } | 179 | } |
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"); |
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 | } |
171 | void SendWidget::slotIrTry(unsigned int trI) { | 190 | void SendWidget::slotIrTry(unsigned int trI) { |
@@ -197,13 +216,22 @@ void SendWidget::slotBtError( int ) { | |||
197 | } | 216 | } |
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"); |
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 | } |
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 |
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 | ||
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(); |
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 | ||
258 | void SendWidget::scan_for_receivers() | 290 | void 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 | ||
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 | |||
@@ -22,5 +22,7 @@ class QVBoxLayout; | |||
22 | namespace OpieObex { | 22 | namespace 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 { |
@@ -45,5 +47,7 @@ namespace OpieObex { | |||
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: |
@@ -64,4 +68,5 @@ namespace OpieObex { | |||
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 | ||
@@ -88,10 +93,14 @@ namespace OpieObex { | |||
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 | } |
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 | |||
@@ -32,6 +32,8 @@ Receiver::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&) ) ); |