| -rw-r--r-- | core/obex/obexsend.cpp | 10 | ||||
| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 2 |
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 @@ -10,9 +10,9 @@ 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 */ @@ -73,9 +73,9 @@ void SendWidget::send( const QString& file, const QString& desc ) { 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; @@ -221,12 +221,12 @@ void SendWidget::scan_for_receivers() 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) { 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 @@ -68,9 +68,9 @@ namespace OpieTooth { #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; |