-rw-r--r-- | noncore/tools/euroconv/euroconv.pro | 5 | ||||
-rw-r--r-- | noncore/tools/euroconv/main.cpp | 30 |
2 files changed, 16 insertions, 19 deletions
diff --git a/noncore/tools/euroconv/euroconv.pro b/noncore/tools/euroconv/euroconv.pro index d817dd3..2b732da 100644 --- a/noncore/tools/euroconv/euroconv.pro +++ b/noncore/tools/euroconv/euroconv.pro | |||
@@ -1,4 +1,3 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | HEADERS = calcdisplay.h \ | 2 | HEADERS = calcdisplay.h \ |
4 | calckeypad.h | 3 | calckeypad.h |
@@ -9,6 +8,6 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
9 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopie |
11 | DESTDIR = $(OPIEDIR)/bin | ||
12 | INTERFACES= | 10 | INTERFACES= |
13 | TARGET = euroconv | 11 | TARGET = euroconv |
12 | |||
14 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp index 7d69535..b765a5e 100644 --- a/noncore/tools/euroconv/main.cpp +++ b/noncore/tools/euroconv/main.cpp | |||
@@ -10,5 +10,4 @@ | |||
10 | * Requirements: Qt | 10 | * Requirements: Qt |
11 | * | 11 | * |
12 | * $Id$ | ||
13 | * | 12 | * |
14 | ***************************************************************************/ | 13 | ***************************************************************************/ |
@@ -16,24 +15,23 @@ | |||
16 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
17 | #include <qvbox.h> | 16 | #include <qvbox.h> |
18 | //#include <qapplication.h> | ||
19 | 17 | ||
20 | #include "calcdisplay.h" | 18 | #include "calcdisplay.h" |
21 | #include "calckeypad.h" | 19 | #include "calckeypad.h" |
22 | 20 | ||
21 | #include <opie/oapplicationfactory.h> | ||
23 | 22 | ||
24 | 23 | struct Layout : QVBox{ | |
25 | int main( int argc, char **argv ) { | 24 | static QString appName() { return QString::fromLatin1("euroconv"); } |
26 | 25 | Layout(QWidget *p, const char* n, WFlags) | |
27 | QPEApplication app( argc, argv ); | 26 | :QVBox(0,"fond" ) |
28 | 27 | { | |
29 | QVBox *layout = new QVBox(0, "fond"); | 28 | LCDDisplay *lcd = new LCDDisplay(this, "lcd"); |
29 | KeyPad *num = new KeyPad(lcd, this, "keypad"); | ||
30 | 30 | ||
31 | LCDDisplay lcd (layout, "lcd"); | 31 | setCaption( QObject::tr("Euroconv") ); |
32 | KeyPad num(&lcd, layout, "keypad"); | 32 | }; |
33 | app.setMainWidget(layout); | 33 | |
34 | layout->setCaption( QObject::tr("Euroconv") ); | 34 | }; |
35 | layout->showMaximized (); | 35 | |
36 | layout->show(); | 36 | OPIE_EXPORT_APP( OApplicationFactory<Layout> ) |
37 | return app.exec(); | ||
38 | } | ||
39 | 37 | ||