-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 | ||||
-rw-r--r-- | noncore/tools/calc2/calc.cpp | 1 | ||||
-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 |
11 files changed, 34 insertions, 39 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 | |||
@@ -1,51 +1,51 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** GNU General Public License version 2 as published by the Free Software | 9 | ** GNU General Public License version 2 as published by the Free Software |
10 | ** Foundation and appearing in the file LICENSE.GPL included in the | 10 | ** Foundation and appearing in the file LICENSE.GPL included in the |
11 | ** packaging of this file. | 11 | ** packaging of this file. |
12 | ** | 12 | ** |
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 "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 |
34 | QRESULT BinaryInterface::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 34 | QRESULT BinaryInterface::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
35 | { | 35 | { |
36 | *iface = 0; | 36 | *iface = 0; |
37 | if ( uuid == IID_QUnknown ) | 37 | if ( uuid == IID_QUnknown ) |
38 | *iface = this; | 38 | *iface = this; |
39 | else if ( uuid == IID_Calc ) | 39 | else if ( uuid == IID_Calc ) |
40 | *iface = this; | 40 | *iface = this; |
41 | 41 | ||
42 | if ( *iface ) | 42 | if ( *iface ) |
43 | (*iface)->addRef(); | 43 | (*iface)->addRef(); |
44 | return QS_OK; | 44 | return QS_OK; |
45 | } | 45 | } |
46 | 46 | ||
47 | Q_EXPORT_INTERFACE() | 47 | Q_EXPORT_INTERFACE() |
48 | { | 48 | { |
49 | Q_CREATE_INSTANCE( BinaryInterface ) | 49 | Q_CREATE_INSTANCE( BinaryInterface ) |
50 | } | 50 | } |
51 | #endif | 51 | #endif |
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 | |||
@@ -1,46 +1,46 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 "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 |
35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
36 | Q_REFCOUNT | 36 | Q_REFCOUNT |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | QWidget *getPlugin( Engine *, QWidget *parent ); | 39 | QWidget *getPlugin( Engine *, QWidget *parent ); |
40 | 40 | ||
41 | private: | 41 | private: |
42 | FormBinaryImpl *input; | 42 | FormBinaryImpl *input; |
43 | ulong ref; | 43 | ulong ref; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #endif | 46 | #endif |
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 | |||
@@ -1,70 +1,70 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 "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; |
31 | return result; | 31 | return result; |
32 | }; | 32 | }; |
33 | }; | 33 | }; |
34 | class iAND : public Instruction { | 34 | class iAND : public Instruction { |
35 | public: | 35 | public: |
36 | iAND():Instruction(){}; | 36 | iAND():Instruction(){}; |
37 | ~iAND(){}; | 37 | ~iAND(){}; |
38 | Data eval(Data num) { | 38 | Data eval(Data num) { |
39 | Data result; | 39 | Data result; |
40 | result.i = num.i & acc.i; | 40 | result.i = num.i & acc.i; |
41 | return result; | 41 | return result; |
42 | }; | 42 | }; |
43 | }; | 43 | }; |
44 | class iNOT : public Instruction { | 44 | class iNOT : public Instruction { |
45 | public: | 45 | public: |
46 | iNOT():Instruction(){}; | 46 | iNOT():Instruction(){}; |
47 | ~iNOT(){}; | 47 | ~iNOT(){}; |
48 | Data eval(Data num) { | 48 | Data eval(Data num) { |
49 | Data result; | 49 | Data result; |
50 | result.i = ~ num.i; | 50 | result.i = ~ num.i; |
51 | return result; | 51 | return result; |
52 | }; | 52 | }; |
53 | }; | 53 | }; |
54 | class iOR : public Instruction { | 54 | class iOR : public Instruction { |
55 | public: | 55 | public: |
56 | iOR():Instruction(){}; | 56 | iOR():Instruction(){}; |
57 | ~iOR(){}; | 57 | ~iOR(){}; |
58 | Data eval(Data num) { | 58 | Data eval(Data num) { |
59 | Data result; | 59 | Data result; |
60 | result.i = num.i | acc.i; | 60 | result.i = num.i | acc.i; |
61 | return result; | 61 | return result; |
62 | }; | 62 | }; |
63 | }; | 63 | }; |
64 | class iLSH : public Instruction { | 64 | class iLSH : public Instruction { |
65 | public: | 65 | public: |
66 | iLSH():Instruction(){}; | 66 | iLSH():Instruction(){}; |
67 | ~iLSH(){}; | 67 | ~iLSH(){}; |
68 | Data eval(Data num) { | 68 | Data eval(Data num) { |
69 | Data result; | 69 | Data result; |
70 | result.i = num.i << 1; | 70 | result.i = num.i << 1; |
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 | |||
@@ -1,50 +1,50 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 | #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 | }; |
33 | ~FormBinaryImpl(){}; | 33 | ~FormBinaryImpl(){}; |
34 | private: | 34 | private: |
35 | Engine *engine; | 35 | Engine *engine; |
36 | 36 | ||
37 | private slots: | 37 | private slots: |
38 | void val0Clicked(); | 38 | void val0Clicked(); |
39 | void val1Clicked(); | 39 | void val1Clicked(); |
40 | 40 | ||
41 | void XORClicked(); | 41 | void XORClicked(); |
42 | void ANDClicked(); | 42 | void ANDClicked(); |
43 | void NOTClicked(); | 43 | void NOTClicked(); |
44 | void ORClicked(); | 44 | void ORClicked(); |
45 | 45 | ||
46 | void LSHClicked(); | 46 | void LSHClicked(); |
47 | void RSHClicked(); | 47 | void RSHClicked(); |
48 | }; | 48 | }; |
49 | 49 | ||
50 | #endif | 50 | #endif |
diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/calc.cpp index c7656bf..8c50c2c 100644 --- a/noncore/tools/calc2/calc.cpp +++ b/noncore/tools/calc2/calc.cpp | |||
@@ -23,82 +23,81 @@ | |||
23 | #include <qdir.h> | 23 | #include <qdir.h> |
24 | #include <qwidgetstack.h> | 24 | #include <qwidgetstack.h> |
25 | 25 | ||
26 | #include "calc.h" | 26 | #include "calc.h" |
27 | #include "plugininterface.h" | 27 | #include "plugininterface.h" |
28 | 28 | ||
29 | calc::calc (QWidget * p, const char *n):QWidget (p, n) | 29 | calc::calc (QWidget * p, const char *n):QWidget (p, n) |
30 | { | 30 | { |
31 | setCaption (tr ("Calculator")); | 31 | setCaption (tr ("Calculator")); |
32 | 32 | ||
33 | // widgets | 33 | // widgets |
34 | LCD = new QLCDNumber (this); | 34 | LCD = new QLCDNumber (this); |
35 | LCD->setMaximumSize (QSize (240, 30)); | 35 | LCD->setMaximumSize (QSize (240, 30)); |
36 | LCD->setNumDigits(12); | 36 | LCD->setNumDigits(12); |
37 | LCD->setSegmentStyle(QLCDNumber::Filled); | 37 | LCD->setSegmentStyle(QLCDNumber::Filled); |
38 | pluginWidgetStack = new QWidgetStack (this); | 38 | pluginWidgetStack = new QWidgetStack (this); |
39 | 39 | ||
40 | // layout widgets | 40 | // layout widgets |
41 | calculatorLayout = new QVBoxLayout (this); | 41 | calculatorLayout = new QVBoxLayout (this); |
42 | calculatorLayout->addWidget (LCD); | 42 | calculatorLayout->addWidget (LCD); |
43 | calculatorLayout->addWidget (pluginWidgetStack); | 43 | calculatorLayout->addWidget (pluginWidgetStack); |
44 | 44 | ||
45 | // no formatting of display for now | 45 | // no formatting of display for now |
46 | connect (&engine, SIGNAL(display(double)), LCD, SLOT(display(double))); | 46 | connect (&engine, SIGNAL(display(double)), LCD, SLOT(display(double))); |
47 | connect (&engine, SIGNAL(display(const QString&)), LCD, SLOT(display(const QString&))); | 47 | connect (&engine, SIGNAL(display(const QString&)), LCD, SLOT(display(const QString&))); |
48 | connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode())); | 48 | connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode())); |
49 | connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode())); | 49 | connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode())); |
50 | connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode())); | 50 | connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode())); |
51 | connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode())); | 51 | connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode())); |
52 | 52 | ||
53 | #ifndef NO_PLUGINS | 53 | #ifndef NO_PLUGINS |
54 | // load plugins | 54 | // load plugins |
55 | QValueList < Plugin >::Iterator mit; | 55 | QValueList < Plugin >::Iterator mit; |
56 | for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) { | 56 | for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) { |
57 | (*mit).interface->release (); | 57 | (*mit).interface->release (); |
58 | (*mit).library->unload (); | 58 | (*mit).library->unload (); |
59 | delete (*mit).library; | 59 | delete (*mit).library; |
60 | } | 60 | } |
61 | pluginList.clear (); | 61 | pluginList.clear (); |
62 | 62 | ||
63 | QString path = QPEApplication::qpeDir() + "plugins/calculator"; | 63 | QString path = QPEApplication::qpeDir() + "plugins/calculator"; |
64 | QDir dir (path, "lib*.so"); | 64 | QDir dir (path, "lib*.so"); |
65 | QStringList list = dir.entryList (); | 65 | QStringList list = dir.entryList (); |
66 | 66 | ||
67 | QStringList::Iterator it; | 67 | QStringList::Iterator it; |
68 | for (it = list.begin (); it != list.end (); ++it) { | 68 | for (it = list.begin (); it != list.end (); ++it) { |
69 | CalcInterface *iface = 0; | 69 | CalcInterface *iface = 0; |
70 | QLibrary *lib = new QLibrary (path + "/" + *it); | 70 | QLibrary *lib = new QLibrary (path + "/" + *it); |
71 | |||
72 | Plugin plugin; | 71 | Plugin plugin; |
73 | plugin.pluginWidget = 0; | 72 | plugin.pluginWidget = 0; |
74 | 73 | ||
75 | if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) == | 74 | if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) == |
76 | QS_OK) { | 75 | QS_OK) { |
77 | plugin.library = lib; | 76 | plugin.library = lib; |
78 | plugin.interface = iface; | 77 | plugin.interface = iface; |
79 | plugin.pluginWidget = plugin.interface->getPlugin(&engine,pluginWidgetStack); | 78 | plugin.pluginWidget = plugin.interface->getPlugin(&engine,pluginWidgetStack); |
80 | if (plugin.pluginWidget) | 79 | if (plugin.pluginWidget) |
81 | pluginWidgetStack->addWidget (plugin.pluginWidget, pluginList.count()); | 80 | pluginWidgetStack->addWidget (plugin.pluginWidget, pluginList.count()); |
82 | pluginList.append (plugin); | 81 | pluginList.append (plugin); |
83 | } else { | 82 | } else { |
84 | delete lib; | 83 | delete lib; |
85 | } | 84 | } |
86 | } | 85 | } |
87 | setMode (1); | 86 | setMode (1); |
88 | #else | 87 | #else |
89 | // load simple interface | 88 | // load simple interface |
90 | #endif | 89 | #endif |
91 | } | 90 | } |
92 | 91 | ||
93 | calc::~calc () | 92 | calc::~calc () |
94 | { | 93 | { |
95 | #ifndef NO_PLUGINS | 94 | #ifndef NO_PLUGINS |
96 | QValueList < Plugin >::Iterator mit; | 95 | QValueList < Plugin >::Iterator mit; |
97 | for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) { | 96 | for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) { |
98 | (*mit).interface->release (); | 97 | (*mit).interface->release (); |
99 | (*mit).library->unload (); | 98 | (*mit).library->unload (); |
100 | delete (*mit).library; | 99 | delete (*mit).library; |
101 | } | 100 | } |
102 | #endif | 101 | #endif |
103 | } | 102 | } |
104 | 103 | ||
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 | |||
@@ -1,51 +1,51 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** GNU General Public License version 2 as published by the Free Software | 9 | ** GNU General Public License version 2 as published by the Free Software |
10 | ** Foundation and appearing in the file LICENSE.GPL included in the | 10 | ** Foundation and appearing in the file LICENSE.GPL included in the |
11 | ** packaging of this file. | 11 | ** packaging of this file. |
12 | ** | 12 | ** |
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 ) |
38 | *iface = this; | 38 | *iface = this; |
39 | else if ( uuid == IID_Calc ) | 39 | else if ( uuid == IID_Calc ) |
40 | *iface = this; | 40 | *iface = this; |
41 | 41 | ||
42 | if ( *iface ) | 42 | if ( *iface ) |
43 | (*iface)->addRef(); | 43 | (*iface)->addRef(); |
44 | return QS_OK; | 44 | return QS_OK; |
45 | } | 45 | } |
46 | 46 | ||
47 | Q_EXPORT_INTERFACE() | 47 | Q_EXPORT_INTERFACE() |
48 | { | 48 | { |
49 | Q_CREATE_INSTANCE( SimpleInterface ) | 49 | Q_CREATE_INSTANCE( SimpleInterface ) |
50 | } | 50 | } |
51 | #endif | 51 | #endif |
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 | |||
@@ -1,46 +1,46 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 | ||
39 | QWidget *getPlugin( Engine *, QWidget *parent ); | 39 | QWidget *getPlugin( Engine *, QWidget *parent ); |
40 | 40 | ||
41 | private: | 41 | private: |
42 | FormSimpleImpl *input; | 42 | FormSimpleImpl *input; |
43 | ulong ref; | 43 | ulong ref; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #endif | 46 | #endif |
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 | |||
@@ -1,73 +1,73 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 | } |
38 | 38 | ||
39 | void FormSimpleImpl::MPlusClicked() { | 39 | void FormSimpleImpl::MPlusClicked() { |
40 | engine->memSave(); | 40 | engine->memSave(); |
41 | } | 41 | } |
42 | 42 | ||
43 | void FormSimpleImpl::evalClicked() { | 43 | void FormSimpleImpl::evalClicked() { |
44 | engine->eval(); | 44 | engine->eval(); |
45 | } | 45 | } |
46 | 46 | ||
47 | void FormSimpleImpl::addClicked () | 47 | void FormSimpleImpl::addClicked () |
48 | { | 48 | { |
49 | engine->pushInstruction (new iAdd ()); | 49 | engine->pushInstruction (new iAdd ()); |
50 | } | 50 | } |
51 | 51 | ||
52 | void FormSimpleImpl::subClicked () | 52 | void FormSimpleImpl::subClicked () |
53 | { | 53 | { |
54 | engine->pushInstruction (new iSub ()); | 54 | engine->pushInstruction (new iSub ()); |
55 | } | 55 | } |
56 | 56 | ||
57 | void FormSimpleImpl::mulClicked () | 57 | void FormSimpleImpl::mulClicked () |
58 | { | 58 | { |
59 | engine->pushInstruction (new iMul ()); | 59 | engine->pushInstruction (new iMul ()); |
60 | } | 60 | } |
61 | 61 | ||
62 | void FormSimpleImpl::divClicked () | 62 | void FormSimpleImpl::divClicked () |
63 | { | 63 | { |
64 | engine->pushInstruction (new iDiv ()); | 64 | engine->pushInstruction (new iDiv ()); |
65 | } | 65 | } |
66 | 66 | ||
67 | void FormSimpleImpl::decimalClicked () | 67 | void FormSimpleImpl::decimalClicked () |
68 | { | 68 | { |
69 | engine->pushValue ('.'); | 69 | engine->pushValue ('.'); |
70 | } | 70 | } |
71 | 71 | ||
72 | void FormSimpleImpl::val1Clicked () | 72 | void FormSimpleImpl::val1Clicked () |
73 | { | 73 | { |
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 | |||
@@ -1,65 +1,65 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 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 | ||
42 | private slots: | 42 | private slots: |
43 | void MPlusClicked(); | 43 | void MPlusClicked(); |
44 | void MCClicked(); | 44 | void MCClicked(); |
45 | void MRClicked(); | 45 | void MRClicked(); |
46 | void CEClicked(); | 46 | void CEClicked(); |
47 | void evalClicked(); | 47 | void evalClicked(); |
48 | void addClicked (); | 48 | void addClicked (); |
49 | void decimalClicked (); | 49 | void decimalClicked (); |
50 | void divClicked (); | 50 | void divClicked (); |
51 | void mulClicked (); | 51 | void mulClicked (); |
52 | void subClicked (); | 52 | void subClicked (); |
53 | void val0Clicked (); | 53 | void val0Clicked (); |
54 | void val1Clicked (); | 54 | void val1Clicked (); |
55 | void val2Clicked (); | 55 | void val2Clicked (); |
56 | void val3Clicked (); | 56 | void val3Clicked (); |
57 | void val4Clicked (); | 57 | void val4Clicked (); |
58 | void val5Clicked (); | 58 | void val5Clicked (); |
59 | void val6Clicked (); | 59 | void val6Clicked (); |
60 | void val7Clicked (); | 60 | void val7Clicked (); |
61 | void val8Clicked (); | 61 | void val8Clicked (); |
62 | void val9Clicked (); | 62 | void val9Clicked (); |
63 | }; | 63 | }; |
64 | 64 | ||
65 | #endif | 65 | #endif |