author | mickeyl <mickeyl> | 2006-07-07 10:39:20 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-07-07 10:39:20 (UTC) |
commit | 043999046de3e7088ef386f18348ebe4484b0e65 (patch) (unidiff) | |
tree | c46908a6ccc183713b98c2ccbf4e0134c74d66b1 | |
parent | 9fb74057cd43bf6ac0cb50c617f9146457367cbc (diff) | |
download | opie-043999046de3e7088ef386f18348ebe4484b0e65.zip opie-043999046de3e7088ef386f18348ebe4484b0e65.tar.gz opie-043999046de3e7088ef386f18348ebe4484b0e65.tar.bz2 |
s/Resource/OResource/
-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 | |||
@@ -11,7 +11,7 @@ using namespace OpieObex; | |||
11 | /* OPIE */ | 11 | /* OPIE */ |
12 | #include <opie2/odebug.h> | 12 | #include <opie2/odebug.h> |
13 | #include <qpe/qcopenvelope_qws.h> | 13 | #include <qpe/qcopenvelope_qws.h> |
14 | #include <qpe/resource.h> | 14 | #include <opie2/oresource.h> |
15 | 15 | ||
16 | using namespace Opie::Core; | 16 | using namespace Opie::Core; |
17 | 17 | ||
@@ -74,7 +74,7 @@ int SendWidget::addReceiver(const char *r, const char *icon) | |||
74 | { | 74 | { |
75 | QListViewItem * item = new QListViewItem( receiverList, 0 ); | 75 | QListViewItem * item = new QListViewItem( receiverList, 0 ); |
76 | item->setText( 0, r); | 76 | item->setText( 0, r); |
77 | item->setPixmap( 1, Resource::loadPixmap( icon ) ); | 77 | item->setPixmap( 1, OResource::loadPixmap( icon ) ); |
78 | 78 | ||
79 | int id=receivers.count(); | 79 | int id=receivers.count(); |
80 | receivers[id]=item; | 80 | receivers[id]=item; |
@@ -222,10 +222,10 @@ void SendWidget::scan_for_receivers() | |||
222 | void SendWidget::toggle_receiver(QListViewItem* item) | 222 | void SendWidget::toggle_receiver(QListViewItem* item) |
223 | { | 223 | { |
224 | // toggle the state of an individual receiver. | 224 | // toggle the state of an individual receiver. |
225 | if(item->pixmap(2)) | 225 | if (item->pixmap(2)) |
226 | item->setPixmap(2,QPixmap()); | 226 | item->setPixmap(2, QPixmap()); |
227 | else | 227 | else |
228 | item->setPixmap(2,Resource::loadPixmap("obex/check.png")); | 228 | item->setPixmap(2, OResource::loadPixmap("obex/check.png")); |
229 | } | 229 | } |
230 | 230 | ||
231 | 231 | ||
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 { | |||
69 | bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); | 69 | bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); |
70 | bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); | 70 | bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); |
71 | bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); | 71 | bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); |
72 | bluezReceiveOnPixmap = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); | 72 | bluezReceiveOnPixmap = OResource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); |
73 | #endif | 73 | #endif |
74 | startTimer(2000); | 74 | startTimer(2000); |
75 | btDevice = 0; | 75 | btDevice = 0; |