From a691909050b60b94f5525093062c23d0fab11d1b Mon Sep 17 00:00:00 2001 From: korovkin Date: Sun, 03 Dec 2006 14:09:33 +0000 Subject: Made OBEX library buildable if bluetooth support is disabled. --- 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 @@ #ifndef OpieBtObex_H #define OpieBtObex_H +#ifdef BLUETOOTH #include "obexbase.h" #include @@ -114,5 +115,5 @@ 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,7 +1,7 @@ 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 INTERFACES = obexsendbase.ui @@ -14,7 +14,11 @@ include( $(OPIEDIR)/include.pro ) 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 @@ -4,18 +4,24 @@ // all. #include "obex.h" +#ifdef BLUETOOTH #include "btobex.h" +#endif #include "obexsend.h" using namespace OpieObex; +#ifdef BLUETOOTH using namespace OpieTooth; +#endif /* OPIE */ #include #include #include #include +#ifdef BLUETOOTH #include #include "remotedevice.h" +#endif using namespace Opie::Core; @@ -52,6 +58,7 @@ void SendWidget::initUI() { connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) ); +#ifdef BLUETOOTH m_btobex = new BtObex(this, "btobex"); connect(m_btobex, SIGNAL(error(int) ), this, SLOT(slotBtError(int) ) ); @@ -63,7 +70,7 @@ void SendWidget::initUI() { chan = new QCopChannel("QPE/BluetoothBack", this ); connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) ); - +#endif } /* @@ -73,7 +80,9 @@ void SendWidget::initUI() { void SendWidget::send( const QString& file, const QString& desc ) { m_file = file; m_irDa.clear(); +#ifdef BLUETOOTH m_bt.clear(); +#endif m_start = 0; fileToSend->setText(desc.isEmpty() ? file : desc ); @@ -88,6 +97,7 @@ void SendWidget::send( const QString& file, const QString& desc ) { irdaStatus->setText(tr("ready")); sendButton->setEnabled( true ); } +#ifdef BLUETOOTH if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) { btStatus->setText(tr("not enabled.")); @@ -99,6 +109,7 @@ void SendWidget::send( const QString& file, const QString& desc ) { sendButton->setEnabled( true ); } read_receivers(); +#endif } int SendWidget::addReceiver(const QString& str, const char *icon) @@ -134,6 +145,7 @@ void SendWidget::slotIrDaDevices( const QStringList& list) { } void SendWidget::slotBTDevices( const QMap& str ) { +#ifdef BLUETOOTH for(QMap::ConstIterator it = str.begin(); it != str.end(); ++it ) { int id = addReceiver(it.key(), "obex/bt.png"); @@ -142,6 +154,9 @@ void SendWidget::slotBTDevices( const QMap& str ) { btStatus->setText(tr("ready.")); m_btIt = m_bt.begin(); +#else + (void)str; +#endif } void SendWidget::slotSelectedDevice( int, int ) { /* if ( name == m_irDeSearch ) { @@ -163,10 +178,14 @@ void SendWidget::slotIrError( int ) { irdaStatus->setText(tr("error :(")); } 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) { setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); @@ -196,15 +215,24 @@ void SendWidget::slotBtError( int ) { btStatus->setText(tr("error :(")); } 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() ) return; @@ -218,13 +246,17 @@ void SendWidget::slotStartBt() { setReceiverStatus( m_btIt.key(), tr("Start sending") ); 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 */ @@ -253,7 +285,7 @@ void SendWidget::read_receivers() sendButton->setEnabled( true ); } } - +#endif void SendWidget::scan_for_receivers() { @@ -261,8 +293,9 @@ void SendWidget::scan_for_receivers() receiverList->clear(); receivers.clear(); m_irDa.clear(); +#ifdef BLUETOOTH m_bt.clear(); - +#endif if ( QCopChannel::isRegistered("QPE/IrDaApplet") ) { irdaStatus->setText(tr("searching...")); @@ -270,12 +303,14 @@ void SendWidget::scan_for_receivers() QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); } +#ifdef BLUETOOTH if ( QCopChannel::isRegistered("QPE/Bluetooth") ) { btStatus->setText(tr("searching...")); sendButton->setEnabled( true ); QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); } +#endif } void SendWidget::toggle_receiver(QListViewItem* item) @@ -293,15 +328,19 @@ void SendWidget::toggle_receiver(QListViewItem* item) 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 } void 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; */ namespace OpieObex { class Obex; +#ifdef BLUETOOTH class BtObex; +#endif struct Pair { Pair(const QString& first = QString::null, @@ -44,7 +46,9 @@ namespace OpieObex { protected: void closeEvent( QCloseEvent* ); +#ifdef BLUETOOTH void read_receivers(); +#endif public slots: void send( const QString& file, const QString& desc ); @@ -63,6 +67,7 @@ namespace OpieObex { void slotIrDaDevices( const QStringList& ); /* Bt Names + BD-Addr */ void slotBTDevices( const QMap& ); + void slotSelectedDevice( int id, int dev ); void dispatchIrda( const QCString& str, const QByteArray& ar ); @@ -87,12 +92,16 @@ namespace OpieObex { int m_start; QMap m_irDa; QMap::Iterator m_irDaIt; +#ifdef BLUETOOTH QMap m_bt; QMap::Iterator m_btIt; +#endif QMap 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 @@ -31,8 +31,10 @@ using namespace Opie::Core; 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&) ) ); m_obex->receive(); -- cgit v0.9.0.2