| -rw-r--r-- | noncore/games/kbill/MCursor.cc | 10 | ||||
| -rw-r--r-- | noncore/games/kbill/Picture.cc | 16 |
2 files changed, 10 insertions, 16 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 @@ -22,6 +22,8 @@ #endif #include <opie2/odebug.h> -using namespace Opie::Core; -#include <qpe/resource.h> +#include <opie2/oresource.h> + +#include <qbitmap.h> + MCursor::~MCursor() { delete cursor; @@ -55,8 +57,8 @@ void MCursor::load(const char *name, int masked) { 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"); + mask = bitmap = Opie::Core::OResource::loadPixmap( "kbill/bitmaps/" + QString::fromLocal8Bit(name) + "_mask.xbm" ); else mask = bitmap; 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 @@ -18,6 +18,5 @@ #include <opie2/odebug.h> -using namespace Opie::Core; -#include <qpe/resource.h> +#include <opie2/oresource.h> #ifdef KDEVER #include <kapp.h> @@ -26,11 +25,4 @@ using namespace Opie::Core; #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; @@ -54,10 +46,10 @@ void Picture::load(const char *name, int index) { #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(); |