From 8fe156f20106aaa4861a60314273733685d37dad Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Mon, 23 Feb 2004 23:19:47 +0000
Subject: Text Editor: libopie->libopie2

---
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
@@ -20,7 +20,6 @@
 
 #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
@@ -4,7 +4,7 @@ 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
@@ -15,9 +15,9 @@
 #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>
@@ -55,6 +55,10 @@
 #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
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
@@ -30,7 +30,7 @@
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include <opie/ofileselector.h>
+//#include <opie/ofileselector.h>
 
 #include <qmainwindow.h>
 #include <qmultilineedit.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
@@ -3,7 +3,7 @@ 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 )
--
cgit v0.9.0.2