From 043999046de3e7088ef386f18348ebe4484b0e65 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Fri, 07 Jul 2006 10:39:20 +0000 Subject: s/Resource/OResource/ --- 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 @@ -11,7 +11,7 @@ using namespace OpieObex; /* OPIE */ #include #include -#include +#include using namespace Opie::Core; @@ -74,7 +74,7 @@ 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; @@ -222,10 +222,10 @@ 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")); } 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 @@ -69,7 +69,7 @@ namespace OpieTooth { 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; -- cgit v0.9.0.2