| author | drw <drw> | 2005-05-20 20:53:54 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-05-20 20:53:54 (UTC) |
| commit | a83cdcaac26fafa7bc0e816e19ee6127c0103195 (patch) (side-by-side diff) | |
| tree | 58afb6daaf27cf37828b3121bf9be325ad5f3629 /noncore/games | |
| parent | 5df741465e0b9ed9e226a103f135e2a6cfa1c8ce (diff) | |
| download | opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.zip opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.tar.gz opie-a83cdcaac26fafa7bc0e816e19ee6127c0103195.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | noncore/games/kbill/MCursor.cc | 12 | ||||
| -rw-r--r-- | noncore/games/kbill/Picture.cc | 16 |
2 files changed, 11 insertions, 17 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 @@ #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; } @@ -54,10 +56,10 @@ void MCursor::load(const char *name, int masked) { #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); diff --git a/noncore/games/kbill/Picture.cc b/noncore/games/kbill/Picture.cc index cf96ddf..9659667 100644 --- a/noncore/games/kbill/Picture.cc +++ b/noncore/games/kbill/Picture.cc @@ -17,21 +17,13 @@ #include "Picture.h" #include <opie2/odebug.h> -using namespace Opie::Core; -#include <qpe/resource.h> +#include <opie2/oresource.h> #ifdef KDEVER #include <kapp.h> #include <kstandarddirs.h> #include <kdebug.h> #endif void Picture::load(const char *name, int index) { - //QString dir = KApplication::kde_datadir(), file; -// QString dir = locate("data",""),file; -// dir += "/kbill/"; -// if (index>=0) -// file.sprintf ("%spixmaps/%s_%d.xpm", (const char *)dir, name, index); -// else -// file.sprintf("%spixmaps/%s.xpm", (const char *)dir, name); #ifdef KDEVER KStandardDirs dirs; QString file; @@ -53,12 +45,12 @@ void Picture::load(const char *name, int index) { height = pix->height(); #endif QString sindex; -pix = new QPixmap(); +//pix = new QPixmap(); sindex.setNum(index); if (index>=0) -pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex)); + pix = new QPixmap( Opie::Core::OResource::loadPixmap( "kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex ) ); else -pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name))); + pix = new QPixmap( Opie::Core::OResource::loadPixmap( "kbill/pixmaps/" + QString::fromLocal8Bit(name) ) ); width = pix->width(); height = pix->height(); |