Diffstat (limited to 'noncore/games/kbill/Picture.cc') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/games/kbill/Picture.cc | 16 |
1 files changed, 4 insertions, 12 deletions
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 | |||
@@ -14,27 +14,19 @@ | |||
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include "Picture.h" | 17 | #include "Picture.h" |
18 | 18 | ||
19 | #include <opie2/odebug.h> | 19 | #include <opie2/odebug.h> |
20 | using 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 |
27 | void Picture::load(const char *name, int index) { | 26 | void 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; |
38 | 30 | ||
39 | if (index>=0) { | 31 | if (index>=0) { |
40 | //kdDebug() << "Here"; | 32 | //kdDebug() << "Here"; |
@@ -50,18 +42,18 @@ void Picture::load(const char *name, int index) { | |||
50 | if (pix->load(file) == FALSE) | 42 | if (pix->load(file) == FALSE) |
51 | oerr << "cannot open " << file << oendl; | 43 | oerr << "cannot open " << file << oendl; |
52 | width = pix->width(); | 44 | width = pix->width(); |
53 | height = pix->height(); | 45 | height = pix->height(); |
54 | #endif | 46 | #endif |
55 | QString sindex; | 47 | QString sindex; |
56 | pix = new QPixmap(); | 48 | //pix = new QPixmap(); |
57 | sindex.setNum(index); | 49 | sindex.setNum(index); |
58 | if (index>=0) | 50 | if (index>=0) |
59 | pix->load(Resource::findPixmap("kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex)); | 51 | pix = new QPixmap( Opie::Core::OResource::loadPixmap( "kbill/pixmaps/" + QString::fromLocal8Bit(name) +"_"+ sindex ) ); |
60 | else | 52 | else |
61 | pix->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(); |
65 | 57 | ||
66 | } | 58 | } |
67 | 59 | ||