From 6040d26c56a95d9f5bd09688e22009fc5b5e124d Mon Sep 17 00:00:00 2001 From: llornkcor Date: Thu, 11 Aug 2005 10:10:40 +0000 Subject: add opie-smb --- (limited to 'noncore/tools') 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 @@ -22,7 +22,7 @@ #include "binaryfactory.h" #include "binaryimpl.h" -#include +#include "../engine.h" QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { if ( !input ) 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 @@ -22,8 +22,8 @@ #define BINARYIMPL_H #include "binaryimpl.h" -#include -#include +#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 @@ -19,7 +19,7 @@ **********************************************************************/ #include "binaryimpl.h" -#include +#include "../instruction.h" class iXOR : public Instruction { public: 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 @@ -21,7 +21,7 @@ #define FORMBINARYINPUTIMPL #include "binary.h" -#include +#include "../engine.h" class FormBinaryImpl : public FormBinary { Q_OBJECT 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 @@ -68,7 +68,6 @@ LCD->setSegmentStyle(QLCDNumber::Filled); for (it = list.begin (); it != list.end (); ++it) { 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 @@ -22,7 +22,7 @@ #include "simplefactory.h" #include "simpleimpl.h" -#include +#include "../engine.h" QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { if ( !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 @@ -22,8 +22,8 @@ #define BINARYIMPL_H #include "simpleimpl.h" -#include -#include +#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 @@ -22,7 +22,7 @@ #include #include "simpleimpl.h" -#include +#include "../stdinstructions.h" void FormSimpleImpl::CEClicked() { engine->hardReset(); 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 @@ -25,8 +25,8 @@ #include #include "simple.h" -#include "engine.h" -#include "instruction.h" +#include "../engine.h" +#include "../instruction.h" class FormSimpleImpl:public FormSimple { Q_OBJECT -- cgit v0.9.0.2