Merge from the 1.0.x release

5 files changed, 20 insertions, 24 deletions

diff --git a/noncore/games/qasteroids/main.cpp b/noncore/games/qasteroids/main.cpp
index 7d1682c..c762990 100644
--- a/noncore/games/qasteroids/main.cpp
+++ b/noncore/games/qasteroids/main.cpp
@@ -12,25 +12,16 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "toplevel.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char *argv[] )
-{
-    QPEApplication app( argc, argv );
-
-    QPEApplication::grabKeyboard();
-
-    KAstTopLevel *mainWidget = new KAstTopLevel();
-    app.showMainWidget( mainWidget );
-
-    app.exec();
-}
 
+OPIE_EXPORT_APP( OApplicationFactory<KAstTopLevel> )
diff --git a/noncore/games/qasteroids/opie-qasteroids.control b/noncore/games/qasteroids/opie-qasteroids.control
index 25a49b4..8764578 100644
--- a/noncore/games/qasteroids/opie-qasteroids.control
+++ b/noncore/games/qasteroids/opie-qasteroids.control
@@ -1,10 +1,10 @@
 Package: opie-qasteroids
-Files: bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
+Files: plugins/application/libqasteroids.so* bin/qasteroids apps/Games/qasteroids.desktop pics/qasteroids/*
 Priority: optional
 Section: opie/games
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Depends: task-opie-minimal
 Description: Game: shoot the asteroids
  A game for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro
index 1a3a8d5..aafc701 100644
--- a/noncore/games/qasteroids/qasteroids.pro
+++ b/noncore/games/qasteroids/qasteroids.pro
@@ -1,11 +1,11 @@
-TEMPLATE	= app
-CONFIG		+= qt warn_on release
-DESTDIR		= $(OPIEDIR)/bin
+CONFIG		+= qt warn_on release quick-app
 HEADERS		= ledmeter.h  sprites.h  toplevel.h  view.h
 SOURCES		= ledmeter.cpp  toplevel.cpp  view.cpp main.cpp
 TARGET		= qasteroids
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
+
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp
index 71daf60..c4fea89 100644
--- a/noncore/games/qasteroids/toplevel.cpp
+++ b/noncore/games/qasteroids/toplevel.cpp
@@ -60,49 +60,52 @@ SLevel levels[MAX_LEVELS] =
     { 3, 0.6 },
     { 3, 0.7 },
     { 3, 0.8 },
     { 4, 0.6 },
     { 4, 0.7 },
     { 4, 0.8 },
     { 5, 0.7 },
     { 5, 0.8 },
     { 5, 0.9 },
     { 5, 1.0 }
 };
 
-const char *soundEvents[] = 
+const char *soundEvents[] =
 {
     "ShipDestroyed",
     "RockDestroyed",
     0
 };
 
-const char *soundDefaults[] = 
+const char *soundDefaults[] =
 {
     "Explosion.wav",
     "ploop.wav",
     0
 };
 
- 
-KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name )
-    : QMainWindow( parent, _name )
+
+KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name, WFlags fl )
+    : QMainWindow( parent, _name, fl )
 {
     setCaption( tr("Asteroids") );
+
+    QPEApplication::grabKeyboard();
+
     QWidget *border = new QWidget( this );
     border->setBackgroundColor( black );
     setCentralWidget( border );
 
     QVBoxLayout *borderLayout = new QVBoxLayout( border );
-    
+
     QWidget *mainWin = new QWidget( border );
     borderLayout->addWidget( mainWin, 2, AlignHCenter );
 
     view = new KAsteroidsView( mainWin );
     connect( view, SIGNAL( shipKilled() ), SLOT( slotShipKilled() ) );
     connect( view, SIGNAL( rockHit(int) ), SLOT( slotRockHit(int) ) );
     connect( view, SIGNAL( rocksRemoved() ), SLOT( slotRocksRemoved() ) );
     connect( view, SIGNAL( updateVitals() ), SLOT( slotUpdateVitals() ) );
 
     QVBoxLayout *vb = new QVBoxLayout( mainWin );
     QHBoxLayout *hb = new QHBoxLayout;
     QHBoxLayout *hbd = new QHBoxLayout;
@@ -248,25 +251,25 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name )
     shipsRemain = 3;
     showHiscores = FALSE;
 
     actions.insert( Qt::Key_Up, Thrust );
     actions.insert( Qt::Key_Left, RotateLeft );
     actions.insert( Qt::Key_Right, RotateRight );
     actions.insert( Qt::Key_Enter, Shoot );
     actions.insert( Qt::Key_Z, Teleport );
     actions.insert( Qt::Key_Down, Brake );
     actions.insert( Qt::Key_P, Pause );
 
 
-    struct utsname name; /* check for embedix kernel running on the zaurus, if 
+    struct utsname name; /* check for embedix kernel running on the zaurus, if
 			    lineo change string, this break
 			 */
     if (uname(&name) != -1) {
 	QString release=name.release;
 	if(release.find("embedix",0,TRUE) !=-1) {
 	  actions.insert( Key_F12, Launch );
 	  actions.insert( Key_F11, Shield );
 	  actions.insert( Key_F9, NewGame );
 	} else {
 	  // ipaq
 	  actions.insert( Key_F12, Shoot );
 	  actions.insert( Key_F11, Shield );
@@ -386,25 +389,25 @@ void KAstTopLevel::keyReleaseEvent( QKeyEvent *event )
             if ( waitShip )
             {
                 view->newShip();
                 waitShip = FALSE;
                 view->hideText();
             }
             else
             {
                 event->ignore();
                 return;
             }
             break;
-	
+
 	case NewGame:
 	    slotNewGame();
 	    break;
 /*
         case Pause:
             {
                 view->pause( TRUE );
                 QMessageBox::information( this,
                                           tr("KAsteroids is paused"),
                                           tr("Paused") );
                 view->pause( FALSE );
             }
diff --git a/noncore/games/qasteroids/toplevel.h b/noncore/games/qasteroids/toplevel.h
index 4e1ac9c..0270763 100644
--- a/noncore/games/qasteroids/toplevel.h
+++ b/noncore/games/qasteroids/toplevel.h
@@ -30,26 +30,28 @@
 #include <qmap.h>
 
 #include "view.h"
 
 
 class KALedMeter;
 class QLCDNumber;
 
 class KAstTopLevel : public QMainWindow
 {
     Q_OBJECT
 public:
-    KAstTopLevel( QWidget *parent=0, const char *name=0 );
+    KAstTopLevel( QWidget *parent=0, const char *name=0, WFlags fl = 0 );
     virtual ~KAstTopLevel();
+    static QString appName() { return QString::fromLatin1("qasteroids"); }
+
 
 private:
     void playSound( const char *snd );
     void readSoundMapping();
     void doStats();
 
 protected:
     virtual void showEvent( QShowEvent * );
     virtual void hideEvent( QHideEvent * );
     virtual void keyPressEvent( QKeyEvent *event );
     virtual void keyReleaseEvent( QKeyEvent *event );
     virtual void focusInEvent( QFocusEvent *event );