-rw-r--r-- | noncore/apps/opie-bartender/bartender.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bartender.pro | 4 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/main.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/opie-bartender.control | 2 |
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 | |||
31 | public: | 31 | public: |
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 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG = qt quick-app |
2 | CONFIG = qt warn_on | ||
3 | HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h | 2 | HEADERS = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h |
4 | SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp | 3 | SOURCES = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 6 | LIBS += -lqpe -lopiecore2 |
8 | DESTDIR = $(OPIEDIR)/bin | ||
9 | TARGET = bartender | 7 | TARGET = bartender |
10 | 8 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 9 | 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 | |||
@@ -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 | ||
15 | int main( int argc, char ** argv ) | 15 | OPIE_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 @@ | |||
1 | Files: bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt | 1 | Files: plugins/applications/libbartender.so* bin/bartender apps/Applications/bartender.desktop etc/bartender/drinkdb.txt |
2 | Priority: optional | 2 | Priority: optional |
3 | Package: opie-bartender | 3 | Package: opie-bartender |
4 | Section: opie/applications | 4 | Section: opie/applications |