-rw-r--r-- | core/obex/obexsend.cpp | 45 |
1 files changed, 42 insertions, 3 deletions
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 } |