Resource -> OResource

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
@@ -16,18 +16,20 @@
  ***************************************************************************/
 #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;
@@ -49,17 +51,17 @@ void MCursor::load(const char *name, int masked) {
 			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);
 }
 
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
@@ -12,31 +12,23 @@
  *   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 "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;
 
 	if (index>=0) {
 	//kdDebug() << "Here";
 	QString sindex;
 	sindex.setNum(index);
@@ -48,22 +40,22 @@ void Picture::load(const char *name, int index) {
 	kdDebug() << file << std::endl;
 	pix = new QPixmap();
 	if (pix->load(file) == FALSE)
 		oerr << "cannot open " << file << oendl;
 	width = pix->width();
 	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();
 
 }
 
 QPixmap* Picture::getPixmap() {
 	return pix;