author | paule <paule> | 2007-07-15 10:07:39 (UTC) |
---|---|---|
committer | paule <paule> | 2007-07-15 10:07:39 (UTC) |
commit | 15fbd2a9189281ca84d89ad6a77261d0046add36 (patch) (side-by-side diff) | |
tree | dac2df5ba719b26ab536fe1bb505325749d3c975 /core | |
parent | fdc3476cebdffd6574fa7e874c1051b0b8bc6145 (diff) | |
download | opie-15fbd2a9189281ca84d89ad6a77261d0046add36.zip opie-15fbd2a9189281ca84d89ad6a77261d0046add36.tar.gz opie-15fbd2a9189281ca84d89ad6a77261d0046add36.tar.bz2 |
Remove erroneous #ifdef BLUETOOTH around code which is for IR only. Patch courtesy of Marek Vasut <marek.vasut@gmail.com>.
-rw-r--r-- | core/obex/obexsend.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index d58b4e9..a401a40 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp @@ -85,200 +85,196 @@ void SendWidget::send( const QString& file, const QString& desc ) { #endif m_start = 0; fileToSend->setText(desc.isEmpty() ? file : desc ); if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) { irdaStatus->setText(tr("not enabled.")); } 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 ); item->setPixmap( 1, OResource::loadPixmap( icon ) ); int id = receivers.count(); receivers[id] = item; return id; } bool SendWidget::receiverSelected(int id) { return (bool)(receivers[id]->pixmap(2) != NULL); } void SendWidget::setReceiverStatus( int id, const QString& status ) { if ( !receivers.contains(id) ) return; receivers[id]->setText(3, status ); } void SendWidget::slotIrDaDevices( const QStringList& list) { for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { int id = addReceiver(*it, "obex/irda.png"); m_irDa.insert( id, (*it) ); } 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() ); QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); }*/ } void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { if ( str == "devices(QStringList)" ) { QDataStream stream( ar, IO_ReadOnly ); QStringList list; stream >> list; slotIrDaDevices( list ); } } 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() ) return; if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { irdaStatus->setText(tr("complete.")); m_irDaIt = m_irDa.begin(); return; } setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); irdaStatus->setText(tr("sending.")); m_obex->send( m_file, tr("noaddress") ); } void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { if ( str == "devices(QStringMap)" ) { QDataStream stream( ar, IO_ReadOnly ); QMap<QString, QString> btmap; stream >> btmap; slotBTDevices( btmap ); } } 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() ) { btStatus->setText(tr("complete.")); 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; DeviceHandler handler; QValueList<RemoteDevice>::ConstIterator it; receiverList->clear(); receivers.clear(); sendButton->setDisabled( true ); btStatus->setText(tr("load.")); m_bt.clear(); if ( QCopChannel::isRegistered("QPE/Bluetooth") ) { devices = handler.load(); for( it = devices.begin(); it != devices.end() ; ++it ) { int id = addReceiver((*it).name(), "obex/bt.png"); m_bt.insert(id, Pair((*it).name(), (*it).mac())); } btStatus->setText(tr("ready.")); m_btIt = m_bt.begin(); |