Resource -> OResource

2 files changed, 10 insertions, 13 deletions

diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp
index 9053d3d..d1e1fac 100644
--- a/noncore/games/qasteroids/toplevel.cpp
+++ b/noncore/games/qasteroids/toplevel.cpp
@@ -28,4 +28,5 @@
 
+#include <opie2/oresource.h>
+
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
@@ -187,3 +188,3 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl )
     label = new QLabel( mainWin );
-    label->setPixmap( Resource::loadPixmap("qasteroids/powerups/brake.png") );
+    label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/brake.png") );
     label->setFixedWidth( 16 );
@@ -202,3 +203,3 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl )
     label = new QLabel( mainWin );
-    label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shield.png") );
+    label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/shield.png") );
     label->setFixedWidth( 16 );
@@ -217,3 +218,3 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl )
     label = new QLabel( mainWin );
-    label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shoot.png") );
+    label->setPixmap( Opie::Core::OResource::loadPixmap("qasteroids/powerups/shoot.png") );
     label->setFixedWidth( 16 );
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp
index 3a4d410..6cab700 100644
--- a/noncore/games/qasteroids/view.cpp
+++ b/noncore/games/qasteroids/view.cpp
@@ -26,4 +26,4 @@
 
-#include <qpe/resource.h>
-
+#include <opie2/oresource.h>
+#include <qpe/qpeapplication.h>
 
@@ -32,3 +32,3 @@
 
-#define IMG_BACKGROUND "qasteroids/bg.png"
+#define IMG_BACKGROUND "qasteroids/bg"
 
@@ -97,4 +97,3 @@ KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name )
 
-    QPixmap pm( Resource::loadPixmap(IMG_BACKGROUND) );
-    field.setBackgroundPixmap( pm );
+    field.setBackgroundPixmap( Opie::Core::OResource::loadPixmap(IMG_BACKGROUND) );
 
@@ -250,6 +249,3 @@ void KAsteroidsView::readSprites()
 {
-    QString sprites_prefix = Resource::findPixmap( IMG_BACKGROUND );
-    int sep = sprites_prefix.findRev( "/" );
-
-    sprites_prefix.truncate( sep );
+    QString sprites_prefix = QPEApplication::qpeDir() + "pics/qasteroids";