summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obexsend.cpp10
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 9a30a0a..2512de3 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -1,38 +1,38 @@
// 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"
#include "btobex.h"
#include "obexsend.h"
using namespace OpieObex;
/* OPIE */
#include <opie2/odebug.h>
#include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
using namespace Opie::Core;
/* QT */
#include <qlabel.h>
#include <qpushbutton.h>
#include <qpixmap.h>
#include <qlistview.h>
#include <unistd.h>
/* TRANSLATOR OpieObex::SendWidget */
SendWidget::SendWidget( QWidget* parent, const char* name )
: obexSendBase( parent, name ) {
initUI();
}
SendWidget::~SendWidget() {
}
void SendWidget::initUI() {
m_obex = new Obex(this, "obex");
connect(m_obex, SIGNAL(error(int) ),
this, SLOT(slotIrError(int) ) );
connect(m_obex, SIGNAL(sent(bool) ),
this, SLOT(slotIrSent(bool) ) );
@@ -53,49 +53,49 @@ void SendWidget::initUI() {
chan = new QCopChannel("QPE/BluetoothBack", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
}
/*
* 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();
m_start = 0;
fileToSend->setText(desc.isEmpty() ? file : desc );
scan_for_receivers();
}
int SendWidget::addReceiver(const char *r, const char *icon)
{
QListViewItem * item = new QListViewItem( receiverList, 0 );
item->setText( 0, r);
- item->setPixmap( 1, Resource::loadPixmap( icon ) );
+ 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();
@@ -201,52 +201,52 @@ void SendWidget::scan_for_receivers()
else
{
QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
irdaStatus->setText(tr("searching..."));
sendButton->setEnabled( true );
QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
}
if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
{
btStatus->setText(tr("not enabled."));
}
else
{
QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
btStatus->setText(tr("searching..."));
sendButton->setEnabled( true );
QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
}
}
void SendWidget::toggle_receiver(QListViewItem* item)
{
// toggle the state of an individual receiver.
- if(item->pixmap(2))
- item->setPixmap(2,QPixmap());
+ if (item->pixmap(2))
+ item->setPixmap(2, QPixmap());
else
- item->setPixmap(2,Resource::loadPixmap("obex/check.png"));
+ item->setPixmap(2, OResource::loadPixmap("obex/check.png"));
}
void SendWidget::closeEvent( QCloseEvent* evt) {
delete m_obex;
m_obex = NULL;
delete m_btobex;
m_btobex = NULL;
obexSendBase::closeEvent(evt);
{
QCopEnvelope e("QPE/IrDaApplet", "disableIrda()");
}
{
QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()");
}
}
void SendWidget::userDone() {
close();
}
QString SendWidget::file()const {
return m_file;
}
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 91ab2e1..8498afc 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -48,49 +48,49 @@ using namespace Opie::Core;
#include <qlayout.h>
#include <qframe.h>
#include <qpixmap.h>
#include <qstring.h>
#include <qtimer.h>
#include <qpopupmenu.h>
#include <qmessagebox.h>
/* STD */
#include <device.h>
namespace OpieTooth {
BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
setFixedHeight( AppLnk::smallIconSize() );
setFixedWidth( AppLnk::smallIconSize() );
#if OPIE_VERSION < 102010
bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" );
bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" );
#else
bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon );
bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon );
bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon );
- bluezReceiveOnPixmap = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
+ bluezReceiveOnPixmap = OResource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon );
#endif
startTimer(2000);
btDevice = 0;
btManager = 0;
bluezactive = false;
bluezDiscoveryActive = false;
bluezReceiveActive = false;
bluezReceiveChanged = false;
doListDevice = false;
isScanning = false;
m_wasOn = false;
m_sync = false;
// TODO: determine whether this channel has to be closed at destruction time.
QCopChannel* chan = new QCopChannel("QPE/Bluetooth", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null");
}
BluezApplet::~BluezApplet() {
if ( btDevice ) {
::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null");
delete btDevice;