4 files changed, 6 insertions, 14 deletions

diff --git a/noncore/apps/opie-bartender/bartender.h b/noncore/apps/opie-bartender/bartender.h
index df1af76..27362df 100644
--- a/noncore/apps/opie-bartender/bartender.h
+++ b/noncore/apps/opie-bartender/bartender.h
@@ -33,2 +33,4 @@ public:
     ~Bartender();
+    
+    static QString appName() { return QString::fromLatin1("bartender"); }
 
diff --git a/noncore/apps/opie-bartender/bartender.pro b/noncore/apps/opie-bartender/bartender.pro
index 41fc0e5..79a39aa 100644
--- a/noncore/apps/opie-bartender/bartender.pro
+++ b/noncore/apps/opie-bartender/bartender.pro
@@ -1,3 +1,2 @@
-TEMPLATE  = app
-CONFIG    = qt warn_on 
+CONFIG    = qt quick-app
 HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
@@ -7,3 +6,2 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2
-DESTDIR     = $(OPIEDIR)/bin
 TARGET      = bartender
diff --git a/noncore/apps/opie-bartender/main.cpp b/noncore/apps/opie-bartender/main.cpp
index eefda7f..593f693 100644
--- a/noncore/apps/opie-bartender/main.cpp
+++ b/noncore/apps/opie-bartender/main.cpp
@@ -11,13 +11,5 @@
 #include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
 
-//Bartender  *bart;
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
-
-    Bartender bart;
-    a.showMainWidget( &bart );
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Bartender> )
diff --git a/noncore/apps/opie-bartender/opie-bartender.control b/noncore/apps/opie-bartender/opie-bartender.control
index db30b9c..045c68e 100644
--- a/noncore/apps/opie-bartender/opie-bartender.control
+++ b/noncore/apps/opie-bartender/opie-bartender.control
@@ -1,2 +1,2 @@
-Files: bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt
+Files: plugins/applications/libbartender.so* bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt
 Priority: optional