Merge from the 1.0.x release

5 files changed, 7 insertions, 16 deletions

diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index dec5591..c12344a 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -34,12 +34,13 @@
 
 CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) :
     QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0),
     cardGame(NULL)
 {
     setIcon( Resource::loadPixmap( "cards" ) );
+    setCaption(tr("Patience"));
 
     // Create Playing Area for Games
     if ( QPixmap::defaultDepth() < 12 ) {
 //      canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B));
 //  canvas.setBackgroundColor(QColor(0x20, 0xb0, 0x50));
   canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D));
diff --git a/noncore/games/solitaire/canvascardwindow.h b/noncore/games/solitaire/canvascardwindow.h
index eddb184..abd6af6 100644
--- a/noncore/games/solitaire/canvascardwindow.h
+++ b/noncore/games/solitaire/canvascardwindow.h
@@ -30,12 +30,13 @@ class QPopupMenu;
 
 
 class CanvasCardWindow : public QMainWindow {
     Q_OBJECT
 
 public:
+    static QString appName() { return QString::fromLatin1("patience"); }
     CanvasCardWindow(QWidget* parent=0, const char* name=0, WFlags f=0);
     virtual ~CanvasCardWindow();
 
 public slots:
     void setCardBacks();
     void changeCardBacks();
diff --git a/noncore/games/solitaire/carddeck.cpp b/noncore/games/solitaire/carddeck.cpp
index a2d0076..b130131 100644
--- a/noncore/games/solitaire/carddeck.cpp
+++ b/noncore/games/solitaire/carddeck.cpp
@@ -22,13 +22,13 @@
 #include "card.h"
 #include "carddeck.h"
 
 
 CardDeck::CardDeck(int jokers, int numOfDecks) : numberOfJokers(jokers), numberOfDecks(numOfDecks), deckCreated(FALSE)
 {
-    cards = new (Card *)[getNumberOfCards()];
+    cards = new Card *[getNumberOfCards()];
 }
 
 
 CardDeck::~CardDeck()
 {
     for (int i = 0; i < getNumberOfCards(); i++)
diff --git a/noncore/games/solitaire/main.cpp b/noncore/games/solitaire/main.cpp
index f81aa3c..bd3cf8b 100644
--- a/noncore/games/solitaire/main.cpp
+++ b/noncore/games/solitaire/main.cpp
@@ -18,19 +18,9 @@
 **
 **********************************************************************/
 
 #include "canvascardwindow.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
-
-    CanvasCardWindow m;
-    m.setCaption( CanvasCardWindow::tr("Patience") );
-    a.showMainWidget( &m );
-
-    return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<CanvasCardWindow> )
\ No newline at end of file
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index 1ac62c3..b1b8bda 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -1,10 +1,8 @@
-TEMPLATE  = app
 
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 
 HEADERS   = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h \
     canvascardgame.h freecellcardgame.h chicanecardgame.h harpcardgame.h teeclubcardgame.h \
     patiencecardgame.h canvascardwindow.h
 
 SOURCES   = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp \
@@ -15,7 +13,8 @@ SOURCES   = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp \
 TARGET    = patience
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe
 
+
 include ( $(OPIEDIR)/include.pro )