summaryrefslogtreecommitdiff
Unidiff
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
@@ -31,6 +31,8 @@ class Bartender : public QMainWindow
31public: 31public:
32 Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 32 Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
33 ~Bartender(); 33 ~Bartender();
34
35 static QString appName() { return QString::fromLatin1("bartender"); }
34 36
35 QToolBar* ToolBar1; 37 QToolBar* ToolBar1;
36 QListView* DrinkView; 38 QListView* DrinkView;
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 @@
1TEMPLATE = app 1CONFIG = qt quick-app
2CONFIG = qt warn_on
3HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h 2HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
4SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp 3SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp
5INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 5DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe -lopiecore2 6LIBS += -lqpe -lopiecore2
8DESTDIR = $(OPIEDIR)/bin
9TARGET = bartender 7TARGET = bartender
10 8
11include ( $(OPIEDIR)/include.pro ) 9include ( $(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
@@ -9,15 +9,7 @@
9 9
10#include "bartender.h" 10#include "bartender.h"
11#include <qpe/qpeapplication.h> 11#include <qpe/qpeapplication.h>
12#include <opie2/oapplicationfactory.h>
12 13
13//Bartender *bart;
14 14
15int main( int argc, char ** argv ) 15OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Bartender> )
16{
17 QPEApplication a( argc, argv );
18
19 Bartender bart;
20 a.showMainWidget( &bart );
21
22 return a.exec();
23}
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,4 +1,4 @@
1Files: bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt 1Files: plugins/applications/libbartender.so* bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt
2Priority: optional 2Priority: optional
3Package: opie-bartender 3Package: opie-bartender
4Section: opie/applications 4Section: opie/applications