Resource -> OResource

3 files changed, 26 insertions, 33 deletions

diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index c36da6c..cd298ef 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -21,5 +21,5 @@
 #include "canvascard.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include <qgfx_qws.h> // Needed to get the device's width
@@ -100,13 +100,17 @@ CanvasCard::CanvasCard( eValue v, eSuit s, bool f, QCanvas *canvas ) :
     if ( !cardsFaces ) {
         if ( qt_screen->deviceWidth() < 200 ) {
-            cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face_small" ) );
-            cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) );
-            cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars_small" ) );
-            cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits_small" ) );
+            cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face_small" ) );
+            cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) );
+            cardsChars = new QBitmap();
+        *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars_small" );
+            cardsSuits = new QBitmap();
+        *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits_small" );
         } else {
-            cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) );
-            cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) );
-            cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) );
-            cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) );
+            cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face" ) );
+            cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) );
+            cardsChars = new QBitmap();
+        *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars" );
+            cardsSuits = new QBitmap();
+        *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits" );
         }
         cardsCharsUpsideDown = Create180RotatedBitmap( cardsChars );
@@ -133,26 +137,26 @@ void CanvasCard::setCardBack(int b)
             switch (cardBack) {
                 case 0:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) ); break;
                 case 1:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002_small" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002_small" ) ); break;
                 case 2:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003_small" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003_small" ) ); break;
                 case 3:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004_small" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004_small" ) ); break;
                 case 4:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005_small" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005_small" ) ); break;
             }
         } else {
             switch (cardBack) {
                 case 0:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) ); break;
                 case 1:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002" ) ); break;
                 case 2:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003" ) ); break;
                 case 3:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004" ) ); break;
                 case 4:
-                    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break;
+                    cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005" ) ); break;
             }
         }
@@ -182,15 +186,6 @@ void CanvasCard::draw(QPainter &painter)
     if ( isFacing() ) {
         
-/*
-        // Now add the joker and card backs to the list of pixmaps
-        QPixmap *CardsBack = new QPixmap( Resource::loadPixmap( "cards/card_joker.png" ) );
-        QPoint *newBackHotspot = new QPoint( 0, 0 );
-        pixmaps->append((const QPixmap *)CardsBack);
-        hotspots->append((const QPoint *)newBackHotspot);
-*/
-
         int w = cardsFaces->width(), h = cardsFaces->height();
 
-        //p->setBrush( NoBrush );
         p->setBrush( QColor( 0xFF, 0xFF, 0xFF ) );
 
diff --git a/noncore/games/solitaire/canvascardgame.h b/noncore/games/solitaire/canvascardgame.h
index b93cfbf..c559a90 100644
--- a/noncore/games/solitaire/canvascardgame.h
+++ b/noncore/games/solitaire/canvascardgame.h
@@ -25,5 +25,4 @@
 #include "canvascard.h"
 
-#include <qpe/resource.h>
 #include <qpe/config.h>
 
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index 503bc92..956c5bd 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -25,6 +25,5 @@
 #include "teeclubcardgame.h"
 
-
-
+#include <opie2/oresource.h>
 
 CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) :
@@ -32,5 +31,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f)
     cardGame(NULL)
 {
-    setIcon( Resource::loadPixmap( "cards" ) );
+    setIcon( Opie::Core::OResource::loadPixmap( "cards" ) );
     setCaption(tr("Patience"));
 
@@ -42,5 +41,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f)
     } else {
         QPixmap bg;
-  bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither );
+  bg.convertFromImage( Opie::Core::OResource::loadImage( "table_pattern" ), ThresholdDither );
         canvas.setBackgroundPixmap(bg);
     }