summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/kbill/MCursor.cc12
-rw-r--r--noncore/games/kbill/Picture.cc16
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 @@
21#include <kstandarddirs.h> 21#include <kstandarddirs.h>
22#endif 22#endif
23#include <opie2/odebug.h> 23#include <opie2/odebug.h>
24using namespace Opie::Core; 24#include <opie2/oresource.h>
25#include <qpe/resource.h> 25
26#include <qbitmap.h>
27
26MCursor::~MCursor() { 28MCursor::~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);
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 @@
17#include "Picture.h" 17#include "Picture.h"
18 18
19#include <opie2/odebug.h> 19#include <opie2/odebug.h>
20using namespace Opie::Core; 20#include <opie2/oresource.h>
21#include <qpe/resource.h>
22#ifdef KDEVER 21#ifdef KDEVER
23#include <kapp.h> 22#include <kapp.h>
24#include <kstandarddirs.h> 23#include <kstandarddirs.h>
25#include <kdebug.h> 24#include <kdebug.h>
26#endif 25#endif
27void Picture::load(const char *name, int index) { 26void Picture::load(const char *name, int index) {
28 //QString dir = KApplication::kde_datadir(), file;
29 // QString dir = locate("data",""),file;
30 // dir += "/kbill/";
31 // if (index>=0)
32 // file.sprintf ("%spixmaps/%s_%d.xpm", (const char *)dir, name, index);
33 // else
34 // file.sprintf("%spixmaps/%s.xpm", (const char *)dir, name);
35#ifdef KDEVER 27#ifdef KDEVER
36 KStandardDirs dirs; 28 KStandardDirs dirs;
37 QString file; 29 QString file;
@@ -53,12 +45,12 @@ void Picture::load(const char *name, int index) {
53 height = pix->height(); 45 height = pix->height();
54#endif 46#endif
55QString sindex; 47QString sindex;
56pix = new QPixmap(); 48//pix = new QPixmap();
57sindex.setNum(index); 49sindex.setNum(index);
58if (index>=0) 50if (index>=0)
59pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex)); 51 pix = new QPixmap( Opie::Core::OResource::loadPixmap( "kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex ) );
60else 52else
61pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name))); 53 pix = new QPixmap( Opie::Core::OResource::loadPixmap( "kbill/pixmaps/" + QString::fromLocal8Bit(name) ) );
62 54
63 width = pix->width(); 55 width = pix->width();
64 height = pix->height(); 56 height = pix->height();