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 @@ -12,26 +12,28 @@ * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "MCursor.h" #ifdef KDEVER #include <kapp.h> #include <kstandarddirs.h> #endif #include <opie2/odebug.h> -using namespace Opie::Core; -#include <qpe/resource.h> +#include <opie2/oresource.h> + +#include <qbitmap.h> + MCursor::~MCursor() { delete cursor; } void MCursor::load(const char *name, int masked) { #ifdef KDEVER QString file, mfile; KStandardDirs dirs; file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + ".xbm"); @@ -45,21 +47,21 @@ void MCursor::load(const char *name, int masked) { // mfile.sprintf ("%sbitmaps/%s_mask.xbm", (const char*)dir, name); mfile = file = dirs.findResource("data","kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); if (mask.load(mfile) == FALSE) { oerr << "cannot open " << file << oendl; exit(1); } } else mask = bitmap; #endif QBitmap bitmap, mask; - bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name)); + bitmap = Opie::Core::OResource::loadPixmap( "kbill/bitmaps/" + QString::fromLocal8Bit( name ) ); - if (masked == SEP_MASK) - mask = bitmap = Resource::loadBitmap("kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm"); + if (masked == SEP_MASK) + mask = bitmap = Opie::Core::OResource::loadPixmap( "kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm" ); else mask = bitmap; cursor = new QCursor(bitmap, mask, bitmap.width() / 2, bitmap.height() / 2); } |