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 @@
-#TEMPLATE = lib
-#CONFIG -= moc
-#CONFIG += qt 
-## Input
-#INTERFACES += binary.ui
-#HEADERS = binaryimpl.h \
-        #    binaryfactory.h 
-#SOURCES = binaryimpl.cpp \
-        #    binaryfactory.cpp
-#INCLUDEPATH     += $(OPIEDIR)/include \
-        #           $(OPIEDIR)/calc2
-#DEPENDPATH      += $(OPIEDIR)/include 
-#DESTDIR = $(OPIEDIR)/plugins/calculator
-#TARGET = binary
-#
+TEMPLATE = lib
+CONFIG += qt 
+INTERFACES += binary.ui
+HEADERS = binaryimpl.h \
+            binaryfactory.h 
+SOURCES = binaryimpl.cpp \
+            binaryfactory.cpp
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
+DESTDIR = $(OPIEDIR)/plugins/calculator
+TARGET = binary
+
 
 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
@@ -23,5 +23,5 @@
 #include "binaryfactory.h"
 #include "binaryimpl.h"
-#include <engine.h>
+#include "../engine.h"
 
 QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) {
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
@@ -23,6 +23,6 @@
 
 #include "binaryimpl.h"
-#include <plugininterface.h>
-#include <engine.h>
+#include "../plugininterface.h"
+#include "../engine.h"
 
 class BinaryInterface : public CalcInterface
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
@@ -20,5 +20,5 @@
 
 #include "binaryimpl.h"
-#include <instruction.h>
+#include "../instruction.h"
 
 class iXOR : public Instruction {
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
@@ -22,5 +22,5 @@
 
 #include "binary.h"
-#include <engine.h>
+#include "../engine.h"
 
 class FormBinaryImpl : public FormBinary {
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
@@ -69,5 +69,4 @@ LCD->setSegmentStyle(QLCDNumber::Filled);
     CalcInterface *iface = 0;
     QLibrary *lib = new QLibrary (path + "/" + *it);
-
     Plugin plugin;
     plugin.pluginWidget = 0;
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 @@
-#TEMPLATE = lib
-#CONFIG -= moc
-#CONFIG += qt 
-## Input
-#INTERFACES += simple.ui
-#HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
-#SOURCES = simpleimpl.cpp simplefactory.cpp
-#INCLUDEPATH     += $(OPIEDIR)/include \
-        #           $(OPIEDIR)/calc2
-#DEPENDPATH      += $(OPIEDIR)/include 
-#DESTDIR = $(OPIEDIR)/plugins/calculator
-#
+TEMPLATE = lib
+CONFIG += qt 
+INTERFACES += simple.ui
+HEADERS = simpleimpl.h  simplefactory.h stdinstructions.h
+SOURCES = simpleimpl.cpp simplefactory.cpp
+INCLUDEPATH     += $(OPIEDIR)/include \
+                    $(OPIEDIR)/calc2
+DEPENDPATH      += $(OPIEDIR)/include 
+DESTDIR = $(OPIEDIR)/plugins/calculator
+
 
 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
@@ -23,5 +23,5 @@
 #include "simplefactory.h"
 #include "simpleimpl.h"
-#include <engine.h>
+#include "../engine.h"
 
 QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) {
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
@@ -23,6 +23,6 @@
 
 #include "simpleimpl.h"
-#include <plugininterface.h>
-#include <engine.h>
+#include "../plugininterface.h"
+#include "../engine.h"
 
 class SimpleInterface : public CalcInterface
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
@@ -23,5 +23,5 @@
 
 #include "simpleimpl.h"
-#include <stdinstructions.h>
+#include "../stdinstructions.h"
 
 void FormSimpleImpl::CEClicked() {
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
@@ -26,6 +26,6 @@
 
 #include "simple.h"
-#include "engine.h"
-#include "instruction.h"
+#include "../engine.h"
+#include "../instruction.h"
 
 class FormSimpleImpl:public FormSimple {