-rw-r--r-- | noncore/tools/euroconv/euroconv.pro | 5 | ||||
-rw-r--r-- | noncore/tools/euroconv/main.cpp | 26 |
2 files changed, 14 insertions, 17 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,14 +1,13 @@ | |||
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 |
5 | SOURCES = calcdisplay.cpp \ | 4 | SOURCES = calcdisplay.cpp \ |
6 | calckeypad.cpp \ | 5 | calckeypad.cpp \ |
7 | main.cpp | 6 | main.cpp |
8 | INCLUDEPATH += $(OPIEDIR)/include | 7 | 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 | |||
@@ -6,34 +6,32 @@ | |||
6 | * | 6 | * |
7 | * | 7 | * |
8 | * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> | 8 | * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> |
9 | * | 9 | * |
10 | * Requirements: Qt | 10 | * Requirements: Qt |
11 | * | 11 | * |
12 | * $Id$ | ||
13 | * | 12 | * |
14 | ***************************************************************************/ | 13 | ***************************************************************************/ |
15 | 14 | ||
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 | ||
23 | struct Layout : QVBox{ | ||
24 | static QString appName() { return QString::fromLatin1("euroconv"); } | ||
25 | Layout(QWidget *p, const char* n, WFlags) | ||
26 | :QVBox(0,"fond" ) | ||
27 | { | ||
28 | LCDDisplay *lcd = new LCDDisplay(this, "lcd"); | ||
29 | KeyPad *num = new KeyPad(lcd, this, "keypad"); | ||
24 | 30 | ||
25 | int main( int argc, char **argv ) { | 31 | setCaption( QObject::tr("Euroconv") ); |
32 | }; | ||
26 | 33 | ||
27 | QPEApplication app( argc, argv ); | 34 | }; |
28 | 35 | ||
29 | QVBox *layout = new QVBox(0, "fond"); | 36 | OPIE_EXPORT_APP( OApplicationFactory<Layout> ) |
30 | |||
31 | LCDDisplay lcd (layout, "lcd"); | ||
32 | KeyPad num(&lcd, layout, "keypad"); | ||
33 | app.setMainWidget(layout); | ||
34 | layout->setCaption( QObject::tr("Euroconv") ); | ||
35 | layout->showMaximized (); | ||
36 | layout->show(); | ||
37 | return app.exec(); | ||
38 | } | ||
39 | 37 | ||