-rw-r--r-- | noncore/tools/calc2/simple/simple.pro | 22 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simplefactory.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simplefactory.h | 4 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simpleimpl.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/calc2/simple/simpleimpl.h | 4 |
5 files changed, 16 insertions, 18 deletions
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 2312f99..dde5e7d 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro | |||
@@ -1,14 +1,12 @@ | |||
1 | #TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | 2 | CONFIG += qt |
3 | #CONFIG += qt | 3 | INTERFACES += simple.ui |
4 | ## Input | 4 | HEADERS = simpleimpl.h simplefactory.h stdinstructions.h |
5 | #INTERFACES += simple.ui | 5 | SOURCES = simpleimpl.cpp simplefactory.cpp |
6 | #HEADERS = simpleimpl.h simplefactory.h stdinstructions.h | 6 | INCLUDEPATH += $(OPIEDIR)/include \ |
7 | #SOURCES = simpleimpl.cpp simplefactory.cpp | 7 | $(OPIEDIR)/calc2 |
8 | #INCLUDEPATH += $(OPIEDIR)/include \ | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | # $(OPIEDIR)/calc2 | 9 | DESTDIR = $(OPIEDIR)/plugins/calculator |
10 | #DEPENDPATH += $(OPIEDIR)/include | 10 | |
11 | #DESTDIR = $(OPIEDIR)/plugins/calculator | ||
12 | # | ||
13 | 11 | ||
14 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/calc2/simple/simplefactory.cpp b/noncore/tools/calc2/simple/simplefactory.cpp index 515418f..52b090b 100644 --- a/noncore/tools/calc2/simple/simplefactory.cpp +++ b/noncore/tools/calc2/simple/simplefactory.cpp | |||
@@ -13,25 +13,25 @@ | |||
13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
15 | ** | 15 | ** |
16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
17 | ** | 17 | ** |
18 | ** Contact info@trolltech.com if any conditions of this licensing are | 18 | ** Contact info@trolltech.com if any conditions of this licensing are |
19 | ** not clear to you. | 19 | ** not clear to you. |
20 | ** | 20 | ** |
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #include "simplefactory.h" | 23 | #include "simplefactory.h" |
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <engine.h> | 25 | #include "../engine.h" |
26 | 26 | ||
27 | QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { | 27 | QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { |
28 | if ( !input ) | 28 | if ( !input ) |
29 | input = new FormSimpleImpl ( e, parent ); | 29 | input = new FormSimpleImpl ( e, parent ); |
30 | return input; | 30 | return input; |
31 | } | 31 | } |
32 | 32 | ||
33 | #ifndef QT_NO_COMPONENT | 33 | #ifndef QT_NO_COMPONENT |
34 | QRESULT SimpleInterface::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 34 | QRESULT SimpleInterface::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
35 | { | 35 | { |
36 | *iface = 0; | 36 | *iface = 0; |
37 | if ( uuid == IID_QUnknown ) | 37 | if ( uuid == IID_QUnknown ) |
diff --git a/noncore/tools/calc2/simple/simplefactory.h b/noncore/tools/calc2/simple/simplefactory.h index e1022fd..460c2b9 100644 --- a/noncore/tools/calc2/simple/simplefactory.h +++ b/noncore/tools/calc2/simple/simplefactory.h | |||
@@ -13,26 +13,26 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef BINARYIMPL_H | 21 | #ifndef BINARYIMPL_H |
22 | #define BINARYIMPL_H | 22 | #define BINARYIMPL_H |
23 | 23 | ||
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <plugininterface.h> | 25 | #include "../plugininterface.h" |
26 | #include <engine.h> | 26 | #include "../engine.h" |
27 | 27 | ||
28 | class SimpleInterface : public CalcInterface | 28 | class SimpleInterface : public CalcInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | SimpleInterface(){input = 0;}; | 31 | SimpleInterface(){input = 0;}; |
32 | virtual ~SimpleInterface(){}; | 32 | virtual ~SimpleInterface(){}; |
33 | 33 | ||
34 | #ifndef QT_NO_COMPONENT | 34 | #ifndef QT_NO_COMPONENT |
35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
36 | Q_REFCOUNT | 36 | Q_REFCOUNT |
37 | #endif | 37 | #endif |
38 | 38 | ||
diff --git a/noncore/tools/calc2/simple/simpleimpl.cpp b/noncore/tools/calc2/simple/simpleimpl.cpp index f71f000..447cbdf 100644 --- a/noncore/tools/calc2/simple/simpleimpl.cpp +++ b/noncore/tools/calc2/simple/simpleimpl.cpp | |||
@@ -13,25 +13,25 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <qpushbutton.h> | 21 | #include <qpushbutton.h> |
22 | #include <qlcdnumber.h> | 22 | #include <qlcdnumber.h> |
23 | 23 | ||
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <stdinstructions.h> | 25 | #include "../stdinstructions.h" |
26 | 26 | ||
27 | void FormSimpleImpl::CEClicked() { | 27 | void FormSimpleImpl::CEClicked() { |
28 | engine->hardReset(); | 28 | engine->hardReset(); |
29 | } | 29 | } |
30 | 30 | ||
31 | void FormSimpleImpl::MCClicked() { | 31 | void FormSimpleImpl::MCClicked() { |
32 | engine->memClear(); | 32 | engine->memClear(); |
33 | } | 33 | } |
34 | 34 | ||
35 | void FormSimpleImpl::MRClicked() { | 35 | void FormSimpleImpl::MRClicked() { |
36 | engine->memRecall(); | 36 | engine->memRecall(); |
37 | } | 37 | } |
diff --git a/noncore/tools/calc2/simple/simpleimpl.h b/noncore/tools/calc2/simple/simpleimpl.h index a2db154..b7b83e2 100644 --- a/noncore/tools/calc2/simple/simpleimpl.h +++ b/noncore/tools/calc2/simple/simpleimpl.h | |||
@@ -16,26 +16,26 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef STANDARDIMPL_H | 21 | #ifndef STANDARDIMPL_H |
22 | #define STANDARDIMPL_H | 22 | #define STANDARDIMPL_H |
23 | 23 | ||
24 | #include <qpe/qmath.h> | 24 | #include <qpe/qmath.h> |
25 | #include <qlcdnumber.h> | 25 | #include <qlcdnumber.h> |
26 | 26 | ||
27 | #include "simple.h" | 27 | #include "simple.h" |
28 | #include "engine.h" | 28 | #include "../engine.h" |
29 | #include "instruction.h" | 29 | #include "../instruction.h" |
30 | 30 | ||
31 | class FormSimpleImpl:public FormSimple { | 31 | class FormSimpleImpl:public FormSimple { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | FormSimpleImpl (Engine *e, QWidget * parent = 0, const char *name = 0) | 34 | FormSimpleImpl (Engine *e, QWidget * parent = 0, const char *name = 0) |
35 | :FormSimple (parent, name) {engine = e;engine->setRepresentation(rDouble);}; | 35 | :FormSimple (parent, name) {engine = e;engine->setRepresentation(rDouble);}; |
36 | 36 | ||
37 | ~FormSimpleImpl () { }; | 37 | ~FormSimpleImpl () { }; |
38 | 38 | ||
39 | private: | 39 | private: |
40 | Engine *engine; | 40 | Engine *engine; |
41 | 41 | ||