author | paule <paule> | 2007-07-15 10:07:39 (UTC) |
---|---|---|
committer | paule <paule> | 2007-07-15 10:07:39 (UTC) |
commit | 15fbd2a9189281ca84d89ad6a77261d0046add36 (patch) (unidiff) | |
tree | dac2df5ba719b26ab536fe1bb505325749d3c975 | |
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 | |||
@@ -165,40 +165,36 @@ void SendWidget::slotSelectedDevice( int, int ) { | |||
165 | 165 | ||
166 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); | 166 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); |
167 | }*/ | 167 | }*/ |
168 | } | 168 | } |
169 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { | 169 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { |
170 | if ( str == "devices(QStringList)" ) { | 170 | if ( str == "devices(QStringList)" ) { |
171 | QDataStream stream( ar, IO_ReadOnly ); | 171 | QDataStream stream( ar, IO_ReadOnly ); |
172 | QStringList list; | 172 | QStringList list; |
173 | stream >> list; | 173 | stream >> list; |
174 | slotIrDaDevices( list ); | 174 | slotIrDaDevices( list ); |
175 | } | 175 | } |
176 | } | 176 | } |
177 | void SendWidget::slotIrError( int ) { | 177 | void SendWidget::slotIrError( int ) { |
178 | irdaStatus->setText(tr("error :(")); | 178 | irdaStatus->setText(tr("error :(")); |
179 | } | 179 | } |
180 | void SendWidget::slotIrSent( bool b) { | 180 | void SendWidget::slotIrSent( bool b) { |
181 | #ifdef BLUETOOTH | ||
182 | QString text = b ? tr("Sent") : tr("Failure"); | 181 | QString text = b ? tr("Sent") : tr("Failure"); |
183 | setReceiverStatus( m_irDaIt.key(), text ); | 182 | setReceiverStatus( m_irDaIt.key(), text ); |
184 | ++m_irDaIt; | 183 | ++m_irDaIt; |
185 | slotStartIrda(); | 184 | slotStartIrda(); |
186 | #else | ||
187 | (void)b; | ||
188 | #endif | ||
189 | } | 185 | } |
190 | void SendWidget::slotIrTry(unsigned int trI) { | 186 | void SendWidget::slotIrTry(unsigned int trI) { |
191 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); | 187 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); |
192 | } | 188 | } |
193 | void SendWidget::slotStartIrda() { | 189 | void SendWidget::slotStartIrda() { |
194 | if ( !m_irDa.count() ) | 190 | if ( !m_irDa.count() ) |
195 | return; | 191 | return; |
196 | if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { | 192 | if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { |
197 | irdaStatus->setText(tr("complete.")); | 193 | irdaStatus->setText(tr("complete.")); |
198 | m_irDaIt = m_irDa.begin(); | 194 | m_irDaIt = m_irDa.begin(); |
199 | return; | 195 | return; |
200 | } | 196 | } |
201 | setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); | 197 | setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); |
202 | irdaStatus->setText(tr("sending.")); | 198 | irdaStatus->setText(tr("sending.")); |
203 | m_obex->send( m_file, tr("noaddress") ); | 199 | m_obex->send( m_file, tr("noaddress") ); |
204 | } | 200 | } |