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
@@ -21,16 +21,7 @@
 #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,5 +1,5 @@
 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>
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,6 +1,4 @@
-        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
@@ -8,4 +6,6 @@ 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
@@ -69,31 +69,34 @@ SLevel levels[MAX_LEVELS] =
     { 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 );
 
@@ -257,7 +260,7 @@ KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name )
     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) {
@@ -395,7 +398,7 @@ void KAstTopLevel::keyReleaseEvent( QKeyEvent *event )
                 return;
             }
             break;
-        
+
         case NewGame:
             slotNewGame();
             break;
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
@@ -39,8 +39,10 @@ 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 );