| author | drw <drw> | 2004-02-23 23:19:47 (UTC) |
|---|---|---|
| committer | drw <drw> | 2004-02-23 23:19:47 (UTC) |
| commit | 8fe156f20106aaa4861a60314273733685d37dad (patch) (side-by-side diff) | |
| tree | 3f069e0b432863fd27f0f1c28287b4a835f3d302 | |
| parent | bff739b1760881bb326ec38ebe62a52195b8c032 (diff) | |
| download | opie-8fe156f20106aaa4861a60314273733685d37dad.zip opie-8fe156f20106aaa4861a60314273733685d37dad.tar.gz opie-8fe156f20106aaa4861a60314273733685d37dad.tar.bz2 | |
Text Editor: libopie->libopie2
| -rw-r--r-- | core/apps/textedit/config.in | 2 | ||||
| -rw-r--r-- | core/apps/textedit/main.cpp | 3 | ||||
| -rw-r--r-- | core/apps/textedit/opie-textedit.control | 2 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.cpp | 10 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.h | 2 | ||||
| -rw-r--r-- | core/apps/textedit/textedit.pro | 2 |
6 files changed, 12 insertions, 9 deletions
diff --git a/core/apps/textedit/config.in b/core/apps/textedit/config.in index e22135b..749af6c 100644 --- a/core/apps/textedit/config.in +++ b/core/apps/textedit/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp index edab73d..9aee47b 100644 --- a/core/apps/textedit/main.cpp +++ b/core/apps/textedit/main.cpp @@ -22,4 +22,3 @@ -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> diff --git a/core/apps/textedit/opie-textedit.control b/core/apps/textedit/opie-textedit.control index 44af66c..aeaef72 100644 --- a/core/apps/textedit/opie-textedit.control +++ b/core/apps/textedit/opie-textedit.control @@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal, libopie1 +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Text Editor diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 1299fe3..2a4d391 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -17,5 +17,5 @@ -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> -#include <opie/ofontselector.h> +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> +#include <opie2/ofontselector.h> @@ -57,2 +57,6 @@ +using Opie::OFileDialog; +using Opie::OFileSelector; +using Opie::OFontSelector; + #if QT_VERSION < 300 diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index 303b707..34f3617 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h @@ -32,3 +32,3 @@ -#include <opie/ofileselector.h> +//#include <opie/ofileselector.h> diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index 6b77ca8..b6d8f15 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro @@ -5,3 +5,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 TARGET = textedit |