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 @@
-#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
@@ -19,13 +19,13 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "simplefactory.h"
 #include "simpleimpl.h"
-#include <engine.h>
+#include "../engine.h"
 
 QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) {
     if ( !input )
 	input = new FormSimpleImpl ( e, parent );
     return input;
 }
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
@@ -19,14 +19,14 @@
 **********************************************************************/
 
 #ifndef BINARYIMPL_H
 #define BINARYIMPL_H
 
 #include "simpleimpl.h"
-#include <plugininterface.h>
-#include <engine.h>
+#include "../plugininterface.h"
+#include "../engine.h"
 
 class SimpleInterface : public CalcInterface
 {
 public:
     SimpleInterface(){input = 0;};
     virtual ~SimpleInterface(){};
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
@@ -19,13 +19,13 @@
 **********************************************************************/
 
 #include <qpushbutton.h>
 #include <qlcdnumber.h>
 
 #include "simpleimpl.h"
-#include <stdinstructions.h>
+#include "../stdinstructions.h"
 
 void FormSimpleImpl::CEClicked() {
     engine->hardReset();
 }
 
 void FormSimpleImpl::MCClicked() {
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
@@ -22,14 +22,14 @@
 #define STANDARDIMPL_H
 
 #include <qpe/qmath.h>
 #include <qlcdnumber.h>
 
 #include "simple.h"
-#include "engine.h"
-#include "instruction.h"
+#include "../engine.h"
+#include "../instruction.h"
 
 class FormSimpleImpl:public FormSimple {
 Q_OBJECT
 public:
   FormSimpleImpl (Engine *e, QWidget * parent = 0, const char *name = 0)
   :FormSimple (parent, name) {engine = e;engine->setRepresentation(rDouble);};