author | drw <drw> | 2005-05-20 20:53:54 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-20 20:53:54 (UTC) |
commit | a83cdcaac26fafa7bc0e816e19ee6127c0103195 (patch) (unidiff) | |
tree | 58afb6daaf27cf37828b3121bf9be325ad5f3629 /noncore/games/kbill/MCursor.cc | |
parent | 5df741465e0b9ed9e226a103f135e2a6cfa1c8ce (diff) | |
download | opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.zip opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.tar.gz opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/games/kbill/MCursor.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/kbill/MCursor.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/games/kbill/MCursor.cc b/noncore/games/kbill/MCursor.cc index 93dd559..ec22d41 100644 --- a/noncore/games/kbill/MCursor.cc +++ b/noncore/games/kbill/MCursor.cc | |||
@@ -21,8 +21,10 @@ | |||
21 | #include <kstandarddirs.h> | 21 | #include <kstandarddirs.h> |
22 | #endif | 22 | #endif |
23 | #include <opie2/odebug.h> | 23 | #include <opie2/odebug.h> |
24 | using namespace Opie::Core; | 24 | #include <opie2/oresource.h> |
25 | #include <qpe/resource.h> | 25 | |
26 | #include <qbitmap.h> | ||
27 | |||
26 | MCursor::~MCursor() { | 28 | MCursor::~MCursor() { |
27 | delete cursor; | 29 | delete cursor; |
28 | } | 30 | } |
@@ -54,10 +56,10 @@ void MCursor::load(const char *name, int masked) { | |||
54 | #endif | 56 | #endif |
55 | 57 | ||
56 | QBitmap bitmap, mask; | 58 | QBitmap bitmap, mask; |
57 | bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name)); | 59 | bitmap = Opie::Core::OResource::loadPixmap( "kbill/bitmaps/" + QString::fromLocal8Bit( name ) ); |
58 | 60 | ||
59 | if (masked == SEP_MASK) | 61 | if (masked == SEP_MASK) |
60 | mask = bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); | 62 | mask = bitmap = Opie::Core::OResource::loadPixmap( "kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm" ); |
61 | else | 63 | else |
62 | mask = bitmap; | 64 | mask = bitmap; |
63 | cursor = new QCursor(bitmap, mask, bitmap.width() / 2, bitmap.height() / 2); | 65 | cursor = new QCursor(bitmap, mask, bitmap.width() / 2, bitmap.height() / 2); |