-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 | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-textedit (simple text editor)" | 2 | boolean "opie-textedit (simple text editor)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
@@ -21,6 +21,5 @@ | |||
21 | #include "textedit.h" | 21 | #include "textedit.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | #include <opie/oapplicationfactory.h> | ||
25 | 24 | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<TextEdit> ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<TextEdit> ) |
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 | |||
@@ -5,5 +5,5 @@ Section: opie/pim | |||
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, libopie1 | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Text Editor | 8 | Description: Text Editor |
9 | The text editor for the Opie environment. | 9 | The text editor for the Opie environment. |
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 | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | 17 | ||
18 | #include <opie/ofileselector.h> | 18 | #include <opie2/ofileselector.h> |
19 | #include <opie/ofiledialog.h> | 19 | #include <opie2/ofiledialog.h> |
20 | #include <opie/ofontselector.h> | 20 | #include <opie2/ofontselector.h> |
21 | 21 | ||
22 | #include <qpe/fontdatabase.h> | 22 | #include <qpe/fontdatabase.h> |
@@ -56,4 +56,8 @@ | |||
56 | #include <stdlib.h> //getenv | 56 | #include <stdlib.h> //getenv |
57 | 57 | ||
58 | using Opie::OFileDialog; | ||
59 | using Opie::OFileSelector; | ||
60 | using Opie::OFontSelector; | ||
61 | |||
58 | #if QT_VERSION < 300 | 62 | #if QT_VERSION < 300 |
59 | 63 | ||
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 | |||
@@ -31,5 +31,5 @@ | |||
31 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
32 | 32 | ||
33 | #include <opie/ofileselector.h> | 33 | //#include <opie/ofileselector.h> |
34 | 34 | ||
35 | #include <qmainwindow.h> | 35 | #include <qmainwindow.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 | |||
@@ -4,5 +4,5 @@ SOURCES = main.cpp textedit.cpp filePermissions.cpp | |||
4 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
5 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
6 | LIBS += -lqpe -lopie | 6 | LIBS += -lqpe -lopiecore2 -lopieui2 |
7 | TARGET = textedit | 7 | TARGET = textedit |
8 | 8 | ||