1 files changed, 23 insertions, 28 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
@@ -17,13 +17,13 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "canvascard.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 #include <qgfx_qws.h> // Needed to get the device's width
 
 #include <math.h>
 
 #if defined( QT_QWS_CASSIOPEIA )
@@ -96,21 +96,25 @@ QBitmap *CanvasCard::cardsSuitsUpsideDown = NULL;
 
 CanvasCard::CanvasCard( eValue v, eSuit s, bool f, QCanvas *canvas ) :
         Card(v, s, f), QCanvasRectangle( 0, 0, 1, 1, canvas ), cardBack(1), scaleX(1.0), scaleY(1.0)
 {
     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 );
         cardsSuitsUpsideDown = Create180RotatedBitmap( cardsSuits );
     }
     xOff = cardsFaces->width() / 2;
     yOff = cardsFaces->height() / 2;
@@ -129,34 +133,34 @@ void CanvasCard::setCardBack(int b)
         if ( cardsBacks )
             delete cardsBacks;
 
         if ( qt_screen->deviceWidth() < 200 ) {
             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;
             }
         }
 
         if ( !isFacing() )
             redraw();
     }
@@ -178,23 +182,14 @@ void CanvasCard::draw(QPainter &painter)
         ix = 0;
         iy = 0;
     }
         
     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 ) );
 
         if ( isRed() == TRUE )
             p->setPen( QColor( 0xFF, 0, 0 ) );
         else
             p->setPen( QColor( 0, 0, 0 ) );