summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 23:21:59 (UTC)
committer drw <drw>2004-03-02 23:21:59 (UTC)
commit8283412db56bdbbff6df3aad0c5d6df100c9e4b6 (patch) (unidiff)
tree2de9f1828adc3c77873e3b1e37fc76bce8c5deb2
parent89dca0a260008dc8887fa6d19f40e7712aa52325 (diff)
downloadopie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.zip
opie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.tar.gz
opie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.tar.bz2
Calculator: libopie -> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/calculator/calculator.pro2
-rw-r--r--noncore/tools/calculator/config.in2
-rw-r--r--noncore/tools/calculator/main.cpp3
-rw-r--r--noncore/tools/calculator/opie-calculator.control2
4 files changed, 4 insertions, 5 deletions
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro
index 8f631be..4526fad 100644
--- a/noncore/tools/calculator/calculator.pro
+++ b/noncore/tools/calculator/calculator.pro
@@ -4,7 +4,7 @@ SOURCES = calculatorimpl.cpp \
4 main.cpp 4 main.cpp
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6 DEPENDPATH+= $(OPIEDIR)/include 6 DEPENDPATH+= $(OPIEDIR)/include
7LIBS += -lqpe 7LIBS += -lqpe -lopiecore2
8 INTERFACES= calculator.ui 8 INTERFACES= calculator.ui
9 TARGET = calculator 9 TARGET = calculator
10 10
diff --git a/noncore/tools/calculator/config.in b/noncore/tools/calculator/config.in
index b06df9b..e9c2588 100644
--- a/noncore/tools/calculator/config.in
+++ b/noncore/tools/calculator/config.in
@@ -1,4 +1,4 @@
1 config CALCULATOR 1 config CALCULATOR
2 boolean "opie-calculator (A multi-function calculator with units conversion)" 2 boolean "opie-calculator (A multi-function calculator with units conversion)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/tools/calculator/main.cpp b/noncore/tools/calculator/main.cpp
index c4d00b1..145ba38 100644
--- a/noncore/tools/calculator/main.cpp
+++ b/noncore/tools/calculator/main.cpp
@@ -20,7 +20,6 @@
20 20
21#include "calculatorimpl.h" 21#include "calculatorimpl.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <opie2/oapplicationfactory.h>
24#include <opie/oapplicationfactory.h>
25 24
26OPIE_EXPORT_APP( OApplicationFactory<CalculatorImpl> ) 25OPIE_EXPORT_APP( OApplicationFactory<CalculatorImpl> )
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index f5a03ad..bacf52c 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: Calculator 8Description: Calculator
9 A multi-function calculator for the Opie environment. 9 A multi-function calculator for the Opie environment.
10 Includes units conversion. 10 Includes units conversion.