| author | drw <drw> | 2004-03-02 23:21:59 (UTC) |
|---|---|---|
| committer | drw <drw> | 2004-03-02 23:21:59 (UTC) |
| commit | 8283412db56bdbbff6df3aad0c5d6df100c9e4b6 (patch) (side-by-side diff) | |
| tree | 2de9f1828adc3c77873e3b1e37fc76bce8c5deb2 | |
| parent | 89dca0a260008dc8887fa6d19f40e7712aa52325 (diff) | |
| download | opie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.zip opie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.tar.gz opie-8283412db56bdbbff6df3aad0c5d6df100c9e4b6.tar.bz2 | |
Calculator: libopie -> libopie2
| -rw-r--r-- | noncore/tools/calculator/calculator.pro | 2 | ||||
| -rw-r--r-- | noncore/tools/calculator/config.in | 2 | ||||
| -rw-r--r-- | noncore/tools/calculator/main.cpp | 3 | ||||
| -rw-r--r-- | noncore/tools/calculator/opie-calculator.control | 2 |
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 @@ -1,11 +1,11 @@ CONFIG = qt warn_on release quick-app HEADERS = calculatorimpl.h SOURCES = calculatorimpl.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 INTERFACES = calculator.ui TARGET = calculator include ( $(OPIEDIR)/include.pro ) 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 @@ config CALCULATOR boolean "opie-calculator (A multi-function calculator with units conversion)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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 @@ -11,16 +11,15 @@ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "calculatorimpl.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> OPIE_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 @@ -1,11 +1,11 @@ Package: opie-calculator Files: plugins/application/libcalculator.so* bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc Priority: optional Section: opie/applications Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Calculator A multi-function calculator for the Opie environment. Includes units conversion. Version: $QPE_VERSION$EXTRAVERSION |