summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-bartender/bartender.h2
-rw-r--r--noncore/apps/opie-bartender/bartender.pro4
-rw-r--r--noncore/apps/opie-bartender/main.cpp12
-rw-r--r--noncore/apps/opie-bartender/opie-bartender.control2
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
@@ -28,12 +28,14 @@ class Bartender : public QMainWindow
{
Q_OBJECT
public:
Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Bartender();
+
+ static QString appName() { return QString::fromLatin1("bartender"); }
QToolBar* ToolBar1;
QListView* DrinkView;
QFile dbFile;
public slots:
void doEdit();
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,11 +1,9 @@
-TEMPLATE = app
-CONFIG = qt warn_on
+CONFIG = qt quick-app
HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
-DESTDIR = $(OPIEDIR)/bin
TARGET = bartender
include ( $(OPIEDIR)/include.pro )
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
@@ -6,18 +6,10 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "bartender.h"
#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,7 +1,7 @@
-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
Package: opie-bartender
Section: opie/applications
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION