Made OBEX library buildable if bluetooth support is disabled.

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 @@
 #ifndef OpieBtObex_H
 #define OpieBtObex_H
+#ifdef BLUETOOTH
 
 #include "obexbase.h"
@@ -115,4 +116,4 @@ private slots:
 };
 
-
+#endif //BLUETOOTH
 #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 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on 
-HEADERS	=   obex.h btobex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h
-SOURCES	=   obex.cpp btobex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp
+HEADERS	=   obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h
+SOURCES	=   obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp
 TARGET		= opieobex
 DESTDIR		= $(OPIEDIR)/plugins/obex
@@ -15,6 +15,10 @@ target.path = $$prefix/plugins/applets
 
 #FIXME: These parameters are used if bluetooth is used
+CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
+contains( CONFTEST, y ){
+HEADERS     += btobex.h
+SOURCES     += btobex.cpp
 INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
 LIBS        += -lopietooth1 -lbluetooth -lopenobex
 DEFINES     += BLUETOOTH
-
+}
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 @@
 
 #include "obex.h"
+#ifdef BLUETOOTH
 #include "btobex.h"
+#endif
 #include "obexsend.h"
 using namespace OpieObex;
+#ifdef BLUETOOTH
 using namespace OpieTooth;
+#endif
 
 /* OPIE */
@@ -15,6 +19,8 @@ using namespace OpieTooth;
 #include <opie2/oresource.h>
 #include <qpe/version.h>
+#ifdef BLUETOOTH
 #include <devicehandler.h>
 #include "remotedevice.h"
+#endif
 
 using namespace Opie::Core;
@@ -53,4 +59,5 @@ void SendWidget::initUI() {
             this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) );
 
+#ifdef BLUETOOTH
     m_btobex = new BtObex(this, "btobex");
     connect(m_btobex, SIGNAL(error(int) ),
@@ -64,5 +71,5 @@ void SendWidget::initUI() {
     connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
             this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
-
+#endif
 }
 
@@ -74,5 +81,7 @@ void SendWidget::send( const QString& file, const QString& desc ) {
     m_file = file;
     m_irDa.clear();
+#ifdef BLUETOOTH
     m_bt.clear();
+#endif
     m_start = 0;
 
@@ -89,4 +98,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
         sendButton->setEnabled( true );
     }
+#ifdef BLUETOOTH
     if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
     {
@@ -100,4 +110,5 @@ void SendWidget::send( const QString& file, const QString& desc ) {
     }
     read_receivers();
+#endif
 }
 
@@ -135,4 +146,5 @@ void SendWidget::slotIrDaDevices( const QStringList& list) {
 
 void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
+#ifdef BLUETOOTH
     for(QMap<QString, QString>::ConstIterator it = str.begin(); 
         it != str.end(); ++it ) {
@@ -143,4 +155,7 @@ void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) {
     m_btIt = m_bt.begin();
 
+#else
+    (void)str;
+#endif
 }
 void SendWidget::slotSelectedDevice( int, int ) {
@@ -164,8 +179,12 @@ void SendWidget::slotIrError( int ) {
 }
 void SendWidget::slotIrSent( bool b) {
+#ifdef BLUETOOTH
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_irDaIt.key(), text );
     ++m_irDaIt;
     slotStartIrda();
+#else
+    (void)b;
+#endif
 }
 void SendWidget::slotIrTry(unsigned int trI) {
@@ -197,13 +216,22 @@ void SendWidget::slotBtError( int ) {
 }
 void SendWidget::slotBtSent( bool b) {
+#ifdef BLUETOOTH
     QString text = b ? tr("Sent") : tr("Failure");
     setReceiverStatus( m_btIt.key(), text );
     ++m_btIt;
     slotStartBt();
+#else
+    (void)b;
+#endif
 }
 void SendWidget::slotBtTry(unsigned int trI) {
+#ifdef BLUETOOTH
     setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) );
+#else
+    (void)trI;
+#endif
 }
 void SendWidget::slotStartBt() {
+#ifdef BLUETOOTH
     // skip past unselected receivers
     if ( !m_bt.count() ) 
@@ -219,11 +247,15 @@ void SendWidget::slotStartBt() {
     btStatus->setText(tr("sending."));
     m_btobex->send( m_file, m_btIt.data().second() );
+#endif
 }
 
 void SendWidget::send_to_receivers() {
+#ifdef BLUETOOTH
     slotStartBt();
+#endif
     slotStartIrda();
 }
 
+#ifdef BLUETOOTH
 /**
  * Read receivers saved by bluetooth manager
@@ -254,5 +286,5 @@ void SendWidget::read_receivers()
     }
 }
-
+#endif
 
 void SendWidget::scan_for_receivers()
@@ -262,6 +294,7 @@ void SendWidget::scan_for_receivers()
     receivers.clear();
     m_irDa.clear();
+#ifdef BLUETOOTH
     m_bt.clear();
-
+#endif
     if ( QCopChannel::isRegistered("QPE/IrDaApplet") )
     {
@@ -271,4 +304,5 @@ void SendWidget::scan_for_receivers()
     }
 
+#ifdef BLUETOOTH
     if ( QCopChannel::isRegistered("QPE/Bluetooth") )
     {
@@ -277,4 +311,5 @@ void SendWidget::scan_for_receivers()
         QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
     }
+#endif
 }
 
@@ -294,13 +329,17 @@ void SendWidget::closeEvent( QCloseEvent* evt) {
     delete m_obex;
     m_obex = NULL;
+#ifdef BLUETOOTH
     delete m_btobex;
     m_btobex = NULL;
+#endif
     obexSendBase::closeEvent(evt);
     {
         QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
     }
+#ifdef BLUETOOTH
     {
         QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
     }
+#endif
 }
 
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;
 namespace OpieObex {
     class Obex;
+#ifdef BLUETOOTH
     class BtObex;
+#endif
 
     struct Pair {
@@ -45,5 +47,7 @@ namespace OpieObex {
     protected:
         void closeEvent( QCloseEvent* );
+#ifdef BLUETOOTH
 	void read_receivers();
+#endif
 
     public slots:
@@ -64,4 +68,5 @@ namespace OpieObex {
         /* Bt Names + BD-Addr */
         void slotBTDevices( const QMap<QString, QString>& );
+
         void slotSelectedDevice( int id, int dev );
 
@@ -88,10 +93,14 @@ namespace OpieObex {
         QMap<int, QString> m_irDa;
         QMap<int, QString>::Iterator m_irDaIt;
+#ifdef BLUETOOTH
         QMap<int, Pair > m_bt;
         QMap<int, Pair>::Iterator m_btIt;
+#endif
 	QMap<int, QListViewItem *> receivers;
         QString m_file;
         Obex* m_obex;
+#ifdef BLUETOOTH
         BtObex* m_btobex;
+#endif
     };
 }
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) {
     if (type == REC_IRDA)
         m_obex = new Obex(this, "Receiver");
+#ifdef BLUETOOTH
     else
         m_obex = new BtObex(this, "Receiver");
+#endif
     connect(m_obex, SIGNAL(receivedFile(const QString&) ),
             this, SLOT(slotReceived(const QString&) ) );