author | drw <drw> | 2005-05-18 14:28:05 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-18 14:28:05 (UTC) |
commit | cb243f00d12c5fc40de02e7f9f20009b52303a66 (patch) (side-by-side diff) | |
tree | f85e840af4db55a67a2a057d6a7f4ef59bfb4385 /noncore/games | |
parent | 600f14a61969ec2edd6d89efecaac997b1c6464f (diff) | |
download | opie-cb243f00d12c5fc40de02e7f9f20009b52303a66.zip opie-cb243f00d12c5fc40de02e7f9f20009b52303a66.tar.gz opie-cb243f00d12c5fc40de02e7f9f20009b52303a66.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/games/qasteroids/toplevel.cpp | 9 | ||||
-rw-r--r-- | noncore/games/qasteroids/view.cpp | 14 |
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 @@ -27,6 +27,7 @@ #include "ledmeter.h" +#include <opie2/oresource.h> + #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qlabel.h> @@ -186,5 +187,5 @@ 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 ); label->setPalette( pal ); @@ -201,5 +202,5 @@ 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 ); label->setPalette( pal ); @@ -216,5 +217,5 @@ 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 ); label->setPalette( pal ); 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 @@ -25,11 +25,11 @@ #include "view.h" -#include <qpe/resource.h> - +#include <opie2/oresource.h> +#include <qpe/qpeapplication.h> #include <stdlib.h> #include <math.h> -#define IMG_BACKGROUND "qasteroids/bg.png" +#define IMG_BACKGROUND "qasteroids/bg" #define REFRESH_DELAY 33 @@ -96,6 +96,5 @@ KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name ) exhaust.setAutoDelete( TRUE ); - QPixmap pm( Resource::loadPixmap(IMG_BACKGROUND) ); - field.setBackgroundPixmap( pm ); + field.setBackgroundPixmap( Opie::Core::OResource::loadPixmap(IMG_BACKGROUND) ); textSprite = new QCanvasText( &field ); @@ -249,8 +248,5 @@ void KAsteroidsView::brake( bool b ) 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"; int i = 0; |