Conf Edit: libopie->libopie2

4 files changed, 13 insertions, 13 deletions

diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 64d5de0..c0f79be 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,20 +1,20 @@
-        CONFIG  = qt warn_on release quick-app
-        HEADERS         = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
-        SOURCES         = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
+CONFIG        = qt warn_on release quick-app
+HEADERS        = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
+SOURCES        = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
-        DEPENDPATH+= $(OPIEDIR)/ioclude
-        INTERFACES= 
-LIBS            += -lopiecore2 -lopieui2
-        TARGET  = confedit
+DEPENDPATH    += $(OPIEDIR)/ioclude
+INTERFACES    =
+LIBS            += -lopiecore2
+TARGET        = confedit
 
 !contains( platform, x11 ) {
-  
+
   include ( $(OPIEDIR)/include.pro )
-  LIBS += -lqpe 
+  LIBS += -lqpe
 }
 
 contains( platform, x11 ) {
-  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
 }
 
 
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in
index e9bc1d1..e377307 100644
--- a/noncore/apps/confedit/config.in
+++ b/noncore/apps/confedit/config.in
@@ -1,4 +1,4 @@
   config CONFEDIT
     boolean "opie-confeditor (generic editor for all Opie settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 7a312c3..584e6b2 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,5 +1,5 @@
 
 #include "mainwindow.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/confedit/opie-confeditor.control b/noncore/apps/confedit/opie-confeditor.control
index 12ae6a9..b8e4c7d 100644
--- a/noncore/apps/confedit/opie-confeditor.control
+++ b/noncore/apps/confedit/opie-confeditor.control
@@ -5,5 +5,5 @@ Section: opie/settings
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: An enditor for the ~/Settings/*.conf files