| -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 @@ -29,12 +29,13 @@ * The Bluetooth OBEX manipulating class declaration */ #ifndef OpieBtObex_H #define OpieBtObex_H +#ifdef BLUETOOTH #include "obexbase.h" #include <qobject.h> #include <services.h> #include <manager.h> #include <obexpush.h> @@ -111,8 +112,8 @@ private slots: void sendNow(); QString parseOut(); void received(); }; }; - +#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,20 +1,24 @@ 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 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher DEPENDPATH += LIBS += -lqpe -lopiecore2 VERSION = 0.0.4 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 @@ -1,24 +1,30 @@ // 7-Jul-2005 mbh@sdgsystems.com: replace hand coded form with one // generated via QT2 Designer. The new form supports // selection of target devices, as opposed to sending to // all. #include "obex.h" +#ifdef BLUETOOTH #include "btobex.h" +#endif #include "obexsend.h" using namespace OpieObex; +#ifdef BLUETOOTH using namespace OpieTooth; +#endif /* OPIE */ #include <opie2/odebug.h> #include <qpe/qcopenvelope_qws.h> #include <opie2/oresource.h> #include <qpe/version.h> +#ifdef BLUETOOTH #include <devicehandler.h> #include "remotedevice.h" +#endif using namespace Opie::Core; /* QT */ #include <qlabel.h> #include <qpushbutton.h> @@ -49,34 +55,37 @@ void SendWidget::initUI() { this, SLOT(slotIrTry(unsigned int) ) ); QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this ); 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) ) ); connect(m_btobex, SIGNAL(sent(bool) ), this, SLOT(slotBtSent(bool) ) ); connect(m_btobex, SIGNAL(currentTry(unsigned int) ), this, SLOT(slotBtTry(unsigned int) ) ); chan = new QCopChannel("QPE/BluetoothBack", this ); connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) ); - +#endif } /* * in send we'll first set everything up * and then wait for a list of devices. */ 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 ); if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) { @@ -85,23 +94,25 @@ void SendWidget::send( const QString& file, const QString& desc ) { else { QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()"); irdaStatus->setText(tr("ready")); sendButton->setEnabled( true ); } +#ifdef BLUETOOTH if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) { btStatus->setText(tr("not enabled.")); } else { QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); btStatus->setText(tr("ready.")); sendButton->setEnabled( true ); } read_receivers(); +#endif } int SendWidget::addReceiver(const QString& str, const char *icon) { QListViewItem * item = new QListViewItem( receiverList, 0 ); item->setText( 0, str ); @@ -131,20 +142,24 @@ void SendWidget::slotIrDaDevices( const QStringList& list) { irdaStatus->setText( tr("ready.")); m_irDaIt = m_irDa.begin(); } void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { +#ifdef BLUETOOTH for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { int id = addReceiver(it.key(), "obex/bt.png"); m_bt.insert( id, Pair( it.key(), it.data() ) ); } btStatus->setText(tr("ready.")); m_btIt = m_bt.begin(); +#else + (void)str; +#endif } void SendWidget::slotSelectedDevice( int, int ) { /* if ( name == m_irDeSearch ) { for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it ) m_devBox->removeDevice( it.key() ); @@ -160,16 +175,20 @@ void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { } } 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 ) )); } void SendWidget::slotStartIrda() { if ( !m_irDa.count() ) @@ -193,21 +212,30 @@ void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { } } 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; while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) ++m_btIt; if (m_btIt == m_bt.end() ) { @@ -215,19 +243,23 @@ void SendWidget::slotStartBt() { m_btIt = m_bt.begin(); return; } 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 */ void SendWidget::read_receivers() { QValueList<RemoteDevice> devices; @@ -250,35 +282,38 @@ void SendWidget::read_receivers() } btStatus->setText(tr("ready.")); m_btIt = m_bt.begin(); sendButton->setEnabled( true ); } } - +#endif void SendWidget::scan_for_receivers() { sendButton->setDisabled( true ); receiverList->clear(); receivers.clear(); m_irDa.clear(); +#ifdef BLUETOOTH m_bt.clear(); - +#endif if ( QCopChannel::isRegistered("QPE/IrDaApplet") ) { irdaStatus->setText(tr("searching...")); sendButton->setEnabled( true ); 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) { if (!item) return; @@ -290,21 +325,25 @@ 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() { close(); } 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 @@ -18,13 +18,15 @@ class QVBoxLayout; * It will attemp to smart and be able to send * it to multiple (selected) devices. * It'll support BT + IrDa */ namespace OpieObex { class Obex; +#ifdef BLUETOOTH class BtObex; +#endif struct Pair { Pair(const QString& first = QString::null, const QString& second = QString::null) : m_first(first), m_second(second ) { } @@ -41,13 +43,15 @@ namespace OpieObex { ~SendWidget(); QString file()const; protected: void closeEvent( QCloseEvent* ); +#ifdef BLUETOOTH void read_receivers(); +#endif public slots: void send( const QString& file, const QString& desc ); signals: void done(); @@ -60,12 +64,13 @@ namespace OpieObex { private slots: // QCOP slots /* IrDa Names*/ void slotIrDaDevices( const QStringList& ); /* Bt Names + BD-Addr */ void slotBTDevices( const QMap<QString, QString>& ); + void slotSelectedDevice( int id, int dev ); void dispatchIrda( const QCString& str, const QByteArray& ar ); void slotIrError( int ); void slotIrSent(bool); @@ -84,16 +89,20 @@ namespace OpieObex { void setReceiverStatus( int id, const QString& status ); bool receiverSelected(int id); int m_start; 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 }; } #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 @@ -28,14 +28,16 @@ using namespace Opie::Core; /* TRANSLATOR OpieObex::Receiver */ 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(); } Receiver::~Receiver() { m_obex->setReceiveEnabled( false ); |