-rw-r--r-- | noncore/multimedia/tonleiter/main.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/tonleiter/mainwidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/tonleiter/tonleiter.control | 2 | ||||
-rw-r--r-- | noncore/multimedia/tonleiter/tonleiter.pro | 4 |
4 files changed, 6 insertions, 13 deletions
diff --git a/noncore/multimedia/tonleiter/main.cpp b/noncore/multimedia/tonleiter/main.cpp index 0eaa162..4b6a858 100644 --- a/noncore/multimedia/tonleiter/main.cpp +++ b/noncore/multimedia/tonleiter/main.cpp | |||
@@ -5,15 +5,8 @@ | |||
5 | * (at your option) any later version. * | 5 | * (at your option) any later version. * |
6 | ***************************************************************************/ | 6 | ***************************************************************************/ |
7 | 7 | ||
8 | #include "mainwidget.h" | 8 | #include "mainwidget.h" |
9 | #include <qpe/qpeapplication.h> | 9 | #include <opie2/oapplicationfactory.h> |
10 | |||
11 | int main(int argc, char* argv[]) | ||
12 | { | ||
13 | QPEApplication a(argc, argv); | ||
14 | MainWidget mw; | ||
15 | a.showMainWidget( &mw); | ||
16 | return a.exec(); | ||
17 | } | ||
18 | 10 | ||
11 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWidget> ) | ||
19 | 12 | ||
diff --git a/noncore/multimedia/tonleiter/mainwidget.h b/noncore/multimedia/tonleiter/mainwidget.h index 5c0a1f8..684b095 100644 --- a/noncore/multimedia/tonleiter/mainwidget.h +++ b/noncore/multimedia/tonleiter/mainwidget.h | |||
@@ -17,8 +17,10 @@ private: | |||
17 | bool showmenu; | 17 | bool showmenu; |
18 | public: | 18 | public: |
19 | MainWidget(QWidget* parent=0,const char* name="MainWidget",WFlags f=0); | 19 | MainWidget(QWidget* parent=0,const char* name="MainWidget",WFlags f=0); |
20 | virtual ~MainWidget(); | 20 | virtual ~MainWidget(); |
21 | static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); } | ||
22 | |||
21 | private slots: | 23 | private slots: |
22 | void fretboardPressed(); | 24 | void fretboardPressed(); |
23 | }; | 25 | }; |
24 | 26 | ||
diff --git a/noncore/multimedia/tonleiter/tonleiter.control b/noncore/multimedia/tonleiter/tonleiter.control index de0eee6..6adc1bc 100644 --- a/noncore/multimedia/tonleiter/tonleiter.control +++ b/noncore/multimedia/tonleiter/tonleiter.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: tonleiter | 1 | Package: tonleiter |
2 | Files: bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop | 2 | Files: plugins/applications/libtonleiter.so* bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/multimedia | 4 | Section: opie/multimedia |
5 | Maintainer: Ralf Waspe <rwaspe@web.de> | 5 | Maintainer: Ralf Waspe <rwaspe@web.de> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/noncore/multimedia/tonleiter/tonleiter.pro b/noncore/multimedia/tonleiter/tonleiter.pro index 4be3bef..f7dfbef 100644 --- a/noncore/multimedia/tonleiter/tonleiter.pro +++ b/noncore/multimedia/tonleiter/tonleiter.pro | |||
@@ -1,11 +1,9 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG = qt quick-app |
2 | CONFIG = qt warn_on | ||
3 | HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h | 2 | HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h |
4 | SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp | 3 | SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.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 | TARGET = tonleiter | 7 | TARGET = tonleiter |
9 | DESTDIR = $(OPIEDIR)/bin | ||
10 | 8 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |