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 /core/apps/textedit | |
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 @@ -1,4 +1,4 @@ config TEXTEDIT boolean "opie-textedit (simple text editor)" 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 @@ -15,12 +15,11 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "textedit.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> 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 @@ -1,10 +1,10 @@ Package: opie-textedit Files: plugins/application/libtextedit.so* bin/textedit apps/1Pim/textedit.desktop pics/textedit Priority: optional Section: opie/pim Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal, libopie1 +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Text Editor The text editor for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION 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 @@ -10,19 +10,19 @@ ** packaging of this file. ** **********************************************************************/ // changes added by L. J. Potter Sun 02-17-2002 21:31:31 #include "textedit.h" #include "filePermissions.h" -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> -#include <opie/ofontselector.h> +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> +#include <opie2/ofontselector.h> #include <qpe/fontdatabase.h> #include <qpe/global.h> #include <qpe/fileselector.h> #include <qpe/applnk.h> #include <qpe/resource.h> #include <qpe/config.h> #include <qpe/qpeapplication.h> @@ -50,16 +50,20 @@ #include <qlayout.h> #include <qapplication.h> #include <qtimer.h> #include <qdir.h> #include <unistd.h> #include <sys/stat.h> #include <stdlib.h> //getenv +using Opie::OFileDialog; +using Opie::OFileSelector; +using Opie::OFontSelector; + #if QT_VERSION < 300 class QpeEditor : public QMultiLineEdit { public: QpeEditor( QWidget *parent, const char * name = 0 ) : QMultiLineEdit( parent, name ) { 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 @@ -25,17 +25,17 @@ #define QTEXTEDIT_OPEN_API //#include "fileBrowser.h" //#include "fileSaver.h" #include <qpe/filemanager.h> #include <qpe/qcopenvelope_qws.h> -#include <opie/ofileselector.h> +//#include <opie/ofileselector.h> #include <qmainwindow.h> #include <qmultilineedit.h> #include <qlist.h> #include <qmap.h> class QAction; class QWidgetStack; 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 @@ -1,9 +1,9 @@ CONFIG += qt warn_on release quick-app HEADERS = textedit.h filePermissions.h SOURCES = main.cpp textedit.cpp filePermissions.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 TARGET = textedit include ( $(OPIEDIR)/include.pro ) |