Make Powerchord quicklaunchable

4 files changed, 6 insertions, 14 deletions

diff --git a/noncore/multimedia/powerchord/main.cpp b/noncore/multimedia/powerchord/main.cpp
index 7fca87c..91afad7 100644
--- a/noncore/multimedia/powerchord/main.cpp
+++ b/noncore/multimedia/powerchord/main.cpp
@@ -1,12 +1,4 @@
 #include "powerchord.h"
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
-
-    PowerchordBase p;
-    a.showMainWidget( &p );
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Powerchord> )
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control
index 13aff53..39d926b 100644
--- a/noncore/multimedia/powerchord/opie-powerchord.control
+++ b/noncore/multimedia/powerchord/opie-powerchord.control
@@ -1,9 +1,9 @@
-Files: bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
+Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
 Priority: optional
 Section: opie/multimedia
 Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com>
 Architecture: arm
 Version: 0.0.8
 Depends: task-opie-minimal
 Description: Guitar Chord generator application
  Allows naming of chords using base note and key. Fretboard diagrams are
diff --git a/noncore/multimedia/powerchord/powerchord.h b/noncore/multimedia/powerchord/powerchord.h
index 0793fd2..b737834 100644
--- a/noncore/multimedia/powerchord/powerchord.h
+++ b/noncore/multimedia/powerchord/powerchord.h
@@ -5,13 +5,15 @@
 class Powerchord : public PowerchordBase
 { 
     Q_OBJECT
 
 public:
     Powerchord( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Powerchord();
 
+    static QString appName() { return QString::fromLatin1("powerchord"); }
+
 private slots:
     void goodBye();
 };
 
 #endif // POWERCHORD_H
diff --git a/noncore/multimedia/powerchord/powerchord.pro b/noncore/multimedia/powerchord/powerchord.pro
index f7af6d6..aa80991 100644
--- a/noncore/multimedia/powerchord/powerchord.pro
+++ b/noncore/multimedia/powerchord/powerchord.pro
@@ -1,10 +1,9 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on 
+CONFIG		= qt quick-app
 
 HEADERS		= powerchord.h   \
                   fretboard.h    \
                   chordengine.h  \
                   vumeter.h      \
                   gs.h gt.h      \
                   powerchordbase.h
 
@@ -14,13 +13,12 @@ SOURCES		= main.cpp        \
                   chordengine.cpp \
                   vumeter.cpp     \
                   gs.cpp gt.cpp   \
                   powerchordbase.cpp
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-DESTDIR         = $(OPIEDIR)/bin
 TARGET		= powerchord
 
 include ( $(OPIEDIR)/include.pro )