summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-23 21:48:49 (UTC)
committer mickeyl <mickeyl>2005-08-23 21:48:49 (UTC)
commitc1fc89afc42b1a8781b92b581f5be19916e2b69d (patch) (side-by-side diff)
tree1f3d28c9833e35faea981c75f675e14cc026c04b
parentbe9fe5d9bbb4ff207f5a5315731d204fa23e0527 (diff)
downloadopie-c1fc89afc42b1a8781b92b581f5be19916e2b69d.zip
opie-c1fc89afc42b1a8781b92b581f5be19916e2b69d.tar.gz
opie-c1fc89afc42b1a8781b92b581f5be19916e2b69d.tar.bz2
make it compile
Diffstat (more/less context) (ignore whitespace changes)
-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.pro12
-rw-r--r--noncore/tools/calc2/main/main.pro2
-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
10 files changed, 12 insertions, 24 deletions
diff --git a/noncore/tools/calc2/binary/binaryfactory.cpp b/noncore/tools/calc2/binary/binaryfactory.cpp
index bccc9ca..2489fdd 100644
--- a/noncore/tools/calc2/binary/binaryfactory.cpp
+++ b/noncore/tools/calc2/binary/binaryfactory.cpp
@@ -19,13 +19,13 @@
** not clear to you.
**
**********************************************************************/
#include "binaryfactory.h"
#include "binaryimpl.h"
-#include "../engine.h"
+#include "engine.h"
QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) {
if ( !input )
input = new FormBinaryImpl ( e, parent );
return input;
}
diff --git a/noncore/tools/calc2/binary/binaryfactory.h b/noncore/tools/calc2/binary/binaryfactory.h
index 237a926..8bad233 100644
--- a/noncore/tools/calc2/binary/binaryfactory.h
+++ b/noncore/tools/calc2/binary/binaryfactory.h
@@ -19,14 +19,14 @@
**********************************************************************/
#ifndef BINARYIMPL_H
#define BINARYIMPL_H
#include "binaryimpl.h"
-#include "../plugininterface.h"
-#include "../engine.h"
+#include "plugininterface.h"
+#include "engine.h"
class BinaryInterface : public CalcInterface
{
public:
BinaryInterface(){input = 0;};
virtual ~BinaryInterface(){};
diff --git a/noncore/tools/calc2/binary/binaryimpl.cpp b/noncore/tools/calc2/binary/binaryimpl.cpp
index ecbf232..2629d07 100644
--- a/noncore/tools/calc2/binary/binaryimpl.cpp
+++ b/noncore/tools/calc2/binary/binaryimpl.cpp
@@ -16,13 +16,13 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "binaryimpl.h"
-#include "../instruction.h"
+#include "instruction.h"
class iXOR : public Instruction {
public:
iXOR():Instruction(){};
~iXOR(){};
Data eval(Data num) {
diff --git a/noncore/tools/calc2/binary/binaryimpl.h b/noncore/tools/calc2/binary/binaryimpl.h
index 7bf123a..f36a31e 100644
--- a/noncore/tools/calc2/binary/binaryimpl.h
+++ b/noncore/tools/calc2/binary/binaryimpl.h
@@ -18,13 +18,13 @@
**
**********************************************************************/
#ifndef FORMBINARYINPUTIMPL
#define FORMBINARYINPUTIMPL
#include "binary.h"
-#include "../engine.h"
+#include "engine.h"
class FormBinaryImpl : public FormBinary {
Q_OBJECT
public:
FormBinaryImpl(Engine *e,QWidget *p) : FormBinary (p,"Binary") {
engine = e;
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
deleted file mode 100644
index 191a4df..0000000
--- a/noncore/tools/calc2/calc.pro
+++ b/dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-CONFIG += qt
-# Input
-HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
-SOURCES += calc.cpp main.cpp engine.cpp
-INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -Wl,-export-dynamic
-TARGET = calc
-DESTDIR = $(OPIEDIR)/bin
-
-include( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/main/main.pro b/noncore/tools/calc2/main/main.pro
index e2eda1f..2ef993d 100644
--- a/noncore/tools/calc2/main/main.pro
+++ b/noncore/tools/calc2/main/main.pro
@@ -2,11 +2,11 @@ TEMPLATE = app
CONFIG += qt
# Input
HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
SOURCES += calc.cpp main.cpp engine.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -Wl,-export-dynamic
+LIBS += -lqpe -Wl,-export-dynamic -lopiecore2
TARGET = calc2
DESTDIR = $(OPIEDIR)/bin
include( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/calc2/simple/simplefactory.cpp b/noncore/tools/calc2/simple/simplefactory.cpp
index 52b090b..d594e9c 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 460c2b9..0487158 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 447cbdf..3cec4e0 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 b7b83e2..a2db154 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);};