-rw-r--r-- | noncore/tools/calc2/binary/binary.pro | 28 | ||||
-rw-r--r-- | noncore/tools/calc2/binary/binaryfactory.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/calc2/binary/binaryfactory.h | 4 | ||||
-rw-r--r-- | noncore/tools/calc2/binary/binaryimpl.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/calc2/binary/binaryimpl.h | 2 |
5 files changed, 18 insertions, 20 deletions
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 1348d00..9cbb0ff 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro | |||
@@ -1,17 +1,15 @@ | |||
1 | #TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | 2 | CONFIG += qt |
3 | #CONFIG += qt | 3 | INTERFACES += binary.ui |
4 | ## Input | 4 | HEADERS = binaryimpl.h \ |
5 | #INTERFACES += binary.ui | 5 | binaryfactory.h |
6 | #HEADERS = binaryimpl.h \ | 6 | SOURCES = binaryimpl.cpp \ |
7 | # binaryfactory.h | 7 | binaryfactory.cpp |
8 | #SOURCES = binaryimpl.cpp \ | 8 | INCLUDEPATH += $(OPIEDIR)/include \ |
9 | # binaryfactory.cpp | 9 | $(OPIEDIR)/calc2 |
10 | #INCLUDEPATH += $(OPIEDIR)/include \ | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | # $(OPIEDIR)/calc2 | 11 | DESTDIR = $(OPIEDIR)/plugins/calculator |
12 | #DEPENDPATH += $(OPIEDIR)/include | 12 | TARGET = binary |
13 | #DESTDIR = $(OPIEDIR)/plugins/calculator | 13 | |
14 | #TARGET = binary | ||
15 | # | ||
16 | 14 | ||
17 | include( $(OPIEDIR)/include.pro ) | 15 | include( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/calc2/binary/binaryfactory.cpp b/noncore/tools/calc2/binary/binaryfactory.cpp index 110334f..bccc9ca 100644 --- a/noncore/tools/calc2/binary/binaryfactory.cpp +++ b/noncore/tools/calc2/binary/binaryfactory.cpp | |||
@@ -17,17 +17,17 @@ | |||
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 "binaryfactory.h" | 23 | #include "binaryfactory.h" |
24 | #include "binaryimpl.h" | 24 | #include "binaryimpl.h" |
25 | #include <engine.h> | 25 | #include "../engine.h" |
26 | 26 | ||
27 | QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { | 27 | QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { |
28 | if ( !input ) | 28 | if ( !input ) |
29 | input = new FormBinaryImpl ( e, parent ); | 29 | input = new FormBinaryImpl ( e, parent ); |
30 | return input; | 30 | return input; |
31 | } | 31 | } |
32 | 32 | ||
33 | #ifndef QT_NO_COMPONENT | 33 | #ifndef QT_NO_COMPONENT |
diff --git a/noncore/tools/calc2/binary/binaryfactory.h b/noncore/tools/calc2/binary/binaryfactory.h index e015384..237a926 100644 --- a/noncore/tools/calc2/binary/binaryfactory.h +++ b/noncore/tools/calc2/binary/binaryfactory.h | |||
@@ -17,18 +17,18 @@ | |||
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 "binaryimpl.h" | 24 | #include "binaryimpl.h" |
25 | #include <plugininterface.h> | 25 | #include "../plugininterface.h" |
26 | #include <engine.h> | 26 | #include "../engine.h" |
27 | 27 | ||
28 | class BinaryInterface : public CalcInterface | 28 | class BinaryInterface : public CalcInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | BinaryInterface(){input = 0;}; | 31 | BinaryInterface(){input = 0;}; |
32 | virtual ~BinaryInterface(){}; | 32 | virtual ~BinaryInterface(){}; |
33 | 33 | ||
34 | #ifndef QT_NO_COMPONENT | 34 | #ifndef QT_NO_COMPONENT |
diff --git a/noncore/tools/calc2/binary/binaryimpl.cpp b/noncore/tools/calc2/binary/binaryimpl.cpp index ffc56ad..ecbf232 100644 --- a/noncore/tools/calc2/binary/binaryimpl.cpp +++ b/noncore/tools/calc2/binary/binaryimpl.cpp | |||
@@ -14,17 +14,17 @@ | |||
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 "binaryimpl.h" | 21 | #include "binaryimpl.h" |
22 | #include <instruction.h> | 22 | #include "../instruction.h" |
23 | 23 | ||
24 | class iXOR : public Instruction { | 24 | class iXOR : public Instruction { |
25 | public: | 25 | public: |
26 | iXOR():Instruction(){}; | 26 | iXOR():Instruction(){}; |
27 | ~iXOR(){}; | 27 | ~iXOR(){}; |
28 | Data eval(Data num) { | 28 | Data eval(Data num) { |
29 | Data result; | 29 | Data result; |
30 | result.i = num.i ^ acc.i; | 30 | result.i = num.i ^ acc.i; |
diff --git a/noncore/tools/calc2/binary/binaryimpl.h b/noncore/tools/calc2/binary/binaryimpl.h index bf9e3a7..7bf123a 100644 --- a/noncore/tools/calc2/binary/binaryimpl.h +++ b/noncore/tools/calc2/binary/binaryimpl.h | |||
@@ -16,17 +16,17 @@ | |||
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 | #ifndef FORMBINARYINPUTIMPL | 20 | #ifndef FORMBINARYINPUTIMPL |
21 | #define FORMBINARYINPUTIMPL | 21 | #define FORMBINARYINPUTIMPL |
22 | 22 | ||
23 | #include "binary.h" | 23 | #include "binary.h" |
24 | #include <engine.h> | 24 | #include "../engine.h" |
25 | 25 | ||
26 | class FormBinaryImpl : public FormBinary { | 26 | class FormBinaryImpl : public FormBinary { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
29 | FormBinaryImpl(Engine *e,QWidget *p) : FormBinary (p,"Binary") { | 29 | FormBinaryImpl(Engine *e,QWidget *p) : FormBinary (p,"Binary") { |
30 | engine = e; | 30 | engine = e; |
31 | engine->setRepresentation(rBin); | 31 | engine->setRepresentation(rBin); |
32 | }; | 32 | }; |