summaryrefslogtreecommitdiff
path: root/noncore/tools/calc2
Unidiff
Diffstat (limited to 'noncore/tools/calc2') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/calc2/binary/binary.pro28
-rw-r--r--noncore/tools/calc2/binary/binaryfactory.cpp2
-rw-r--r--noncore/tools/calc2/binary/binaryfactory.h4
-rw-r--r--noncore/tools/calc2/binary/binaryimpl.cpp2
-rw-r--r--noncore/tools/calc2/binary/binaryimpl.h2
-rw-r--r--noncore/tools/calc2/calc.cpp1
-rw-r--r--noncore/tools/calc2/simple/simple.pro22
-rw-r--r--noncore/tools/calc2/simple/simplefactory.cpp2
-rw-r--r--noncore/tools/calc2/simple/simplefactory.h4
-rw-r--r--noncore/tools/calc2/simple/simpleimpl.cpp2
-rw-r--r--noncore/tools/calc2/simple/simpleimpl.h4
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,16 +1,14 @@
1#TEMPLATE = lib 1TEMPLATE = lib
2#CONFIG -= moc 2CONFIG += qt
3#CONFIG += qt 3INTERFACES += binary.ui
4## Input 4HEADERS = binaryimpl.h \
5#INTERFACES += binary.ui 5 binaryfactory.h
6#HEADERS = binaryimpl.h \ 6SOURCES = binaryimpl.cpp \
7 # binaryfactory.h 7 binaryfactory.cpp
8#SOURCES = binaryimpl.cpp \ 8INCLUDEPATH += $(OPIEDIR)/include \
9 # binaryfactory.cpp 9 $(OPIEDIR)/calc2
10#INCLUDEPATH += $(OPIEDIR)/include \ 10DEPENDPATH += $(OPIEDIR)/include
11 # $(OPIEDIR)/calc2 11DESTDIR = $(OPIEDIR)/plugins/calculator
12#DEPENDPATH += $(OPIEDIR)/include 12TARGET = binary
13#DESTDIR = $(OPIEDIR)/plugins/calculator 13
14#TARGET = binary
15#
16 14
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
@@ -24,3 +24,3 @@
24#include "binaryimpl.h" 24#include "binaryimpl.h"
25#include <engine.h> 25#include "../engine.h"
26 26
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
@@ -24,4 +24,4 @@
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
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
@@ -21,3 +21,3 @@
21#include "binaryimpl.h" 21#include "binaryimpl.h"
22#include <instruction.h> 22#include "../instruction.h"
23 23
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
@@ -23,3 +23,3 @@
23#include "binary.h" 23#include "binary.h"
24#include <engine.h> 24#include "../engine.h"
25 25
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
@@ -70,3 +70,2 @@ LCD->setSegmentStyle(QLCDNumber::Filled);
70 QLibrary *lib = new QLibrary (path + "/" + *it); 70 QLibrary *lib = new QLibrary (path + "/" + *it);
71
72 Plugin plugin; 71 Plugin plugin;
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,13 +1,11 @@
1#TEMPLATE = lib 1TEMPLATE = lib
2#CONFIG -= moc 2CONFIG += qt
3#CONFIG += qt 3INTERFACES += simple.ui
4## Input 4HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
5#INTERFACES += simple.ui 5SOURCES = simpleimpl.cpp simplefactory.cpp
6#HEADERS = simpleimpl.h simplefactory.h stdinstructions.h 6INCLUDEPATH += $(OPIEDIR)/include \
7#SOURCES = simpleimpl.cpp simplefactory.cpp 7 $(OPIEDIR)/calc2
8#INCLUDEPATH += $(OPIEDIR)/include \ 8DEPENDPATH += $(OPIEDIR)/include
9 # $(OPIEDIR)/calc2 9DESTDIR = $(OPIEDIR)/plugins/calculator
10#DEPENDPATH += $(OPIEDIR)/include 10
11#DESTDIR = $(OPIEDIR)/plugins/calculator
12#
13 11
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
@@ -24,3 +24,3 @@
24#include "simpleimpl.h" 24#include "simpleimpl.h"
25#include <engine.h> 25#include "../engine.h"
26 26
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
@@ -24,4 +24,4 @@
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
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
@@ -24,3 +24,3 @@
24#include "simpleimpl.h" 24#include "simpleimpl.h"
25#include <stdinstructions.h> 25#include "../stdinstructions.h"
26 26
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
@@ -27,4 +27,4 @@
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