Merge from the 1.0.x release

6 files changed, 32 insertions, 38 deletions

diff --git a/noncore/games/minesweep/main.cpp b/noncore/games/minesweep/main.cpp
index 83de9a3..bd70f7c 100644
--- a/noncore/games/minesweep/main.cpp
+++ b/noncore/games/minesweep/main.cpp
@@ -23,12 +23,5 @@
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char** argv )
-{
-    QPEApplication a( argc, argv );
+OPIE_EXPORT_APP( OApplicationFactory<MineSweep> )
 
-    MineSweep ms;
-    QPEApplication::setInputMethodHint( &ms, QPEApplication::AlwaysOff );
-    a.showMainWidget( &ms );
-
-    return a.exec();
-}
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index eca1a36..04cfb97 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -355,3 +355,3 @@ void MineField::setup( int level )
     }
-    mines = new (Mine*)[numRows*numCols];
+    mines = new Mine*[numRows*numCols];
     for ( i = 0; i < numCols*numRows; i++ )
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 48644b3..7214a73 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -23,2 +23,3 @@
 
+#include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
@@ -157,8 +158,8 @@ class ResultIndicator : private QLabel
 {
-public:   
+public:
     static void showResult( QWidget *ref, bool won );
-private:    
+private:
     ResultIndicator( QWidget *parent, const char *name, WFlags f)
 	:QLabel( parent, name, f ) {}
-    
+
     void timerEvent( QTimerEvent *);
@@ -172,3 +173,3 @@ void ResultIndicator::showResult( QWidget *ref, bool won )
     ResultIndicator *r = new ResultIndicator( ref, 0, WStyle_Customize | WStyle_Tool | WType_TopLevel );
-				
+
     r->setAlignment( AlignCenter );
@@ -197,3 +198,3 @@ void ResultIndicator::center()
 
-    QPoint pp = w->mapToGlobal( QPoint(0,0) ); 
+    QPoint pp = w->mapToGlobal( QPoint(0,0) );
     QSize s = sizeHint()*3;
@@ -203,3 +204,3 @@ void ResultIndicator::center()
     setGeometry( QRect(pp, s) );
-    
+
 }
@@ -230,3 +231,3 @@ protected:
 	field->setAvailableRect( contentsRect());
-	QFrame::resizeEvent(e); 
+	QFrame::resizeEvent(e);
     }
@@ -241,2 +242,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
 {
+    QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
     srand(::time(0));
@@ -256,3 +258,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     menuBar->insertItem( tr("Game"), gameMenu );
-    
+
     guessLCD = new QLCDNumber( toolBar );
@@ -263,3 +265,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() );
-    
+
 //    guessLCD->setPalette( lcdPal );
@@ -273,3 +275,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) );
-    
+
     timeLCD = new QLCDNumber( toolBar );
@@ -280,3 +282,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     timeLCD->setBackgroundMode( PaletteButton );
-    
+
     setToolBarsMovable ( FALSE );
@@ -298,3 +300,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     setCentralWidget( mainframe );
-    
+
     connect( field, SIGNAL( gameOver( bool ) ), this, SLOT( gameOver( bool ) ) );
diff --git a/noncore/games/minesweep/minesweep.h b/noncore/games/minesweep/minesweep.h
index e860573..527dc9e 100644
--- a/noncore/games/minesweep/minesweep.h
+++ b/noncore/games/minesweep/minesweep.h
@@ -33,2 +33,3 @@ class MineSweep : public QMainWindow
 public:
+    static QString appName() { return QString::fromLatin1("minesweep"); }
     MineSweep( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro
index 8e4001e..9746651 100644
--- a/noncore/games/minesweep/minesweep.pro
+++ b/noncore/games/minesweep/minesweep.pro
@@ -1,15 +1,13 @@
-TEMPLATE	= app

-CONFIG		= qt warn_on release

-DESTDIR		= $(OPIEDIR)/bin

-HEADERS		= minefield.h \

-		  minesweep.h

-SOURCES		= main.cpp \

-		  minefield.cpp \

-		  minesweep.cpp

-INCLUDEPATH += $(OPIEDIR)/include

-DEPENDPATH	+= $(OPIEDIR)/include

-LIBS            += -lqpe

-INTERFACES	= 

-TARGET		= minesweep

-

-include ( $(OPIEDIR)/include.pro )

+CONFIG		= qt warn_on release quick-app
+HEADERS		= minefield.h \
+		  minesweep.h
+SOURCES		= main.cpp \
+		  minefield.cpp \
+		  minesweep.cpp
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
+LIBS            += -lqpe
+INTERFACES	= 
+TARGET		= minesweep
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 32f0352..91343ea 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,3 +1,3 @@
 Package: opie-minesweep
-Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep
+Files: plugins/application/libminesweep.so* bin/minesweep apps/Games/minesweep.desktop pics/minesweep
 Priority: optional