Oxygen: libopie->libopie2

4 files changed, 10 insertions, 11 deletions

diff --git a/noncore/apps/oxygen/config.in b/noncore/apps/oxygen/config.in
index 809f3e6..b3e30ff 100644
--- a/noncore/apps/oxygen/config.in
+++ b/noncore/apps/oxygen/config.in
@@ -2,3 +2,3 @@
     boolean "opie-oxygen (Periodic System of the Elements)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp
index ac992aa..276b90d 100644
--- a/noncore/apps/oxygen/main.cpp
+++ b/noncore/apps/oxygen/main.cpp
@@ -16,7 +16,6 @@
  **************************************************************************/
 
+#include <opie2/oapplicationfactory.h>
 
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
 #include "oxygen.h"
 
diff --git a/noncore/apps/oxygen/opie-oxygen.control b/noncore/apps/oxygen/opie-oxygen.control
index fc834f3..16051db 100644
--- a/noncore/apps/oxygen/opie-oxygen.control
+++ b/noncore/apps/oxygen/opie-oxygen.control
@@ -5,5 +5,5 @@ Section: opie/applications
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Periodic System of the Elements
  The chemistry application for the Opie-environment
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index 71d4dac..0d61d58 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -1,4 +1,4 @@
-        CONFIG  = qt warn_on release quick-app
-        HEADERS         = oxygen.h \
+CONFIG        = qt warn_on release quick-app
+HEADERS        = oxygen.h \
             kmolcalc.h \
             kmolelements.h \
@@ -9,6 +9,6 @@ HEADERS		= oxygen.h \
             datawidgetui.h
 
-        SOURCES         = main.cpp \
-                  oxygen.cpp \
+SOURCES        = main.cpp \
+          oxygen.cpp \
           kmolcalc.cpp \
           calcdlgui.cpp \
@@ -20,8 +20,8 @@ SOURCES		= main.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-        LIBS    += -lqpe 
-        INTERFACES= calcdlg.ui 
+LIBS        += -lqpe -lopiecore2
+INTERFACES    = calcdlg.ui
 
-        TARGET= oxygen
+TARGET    = oxygen
 
 include ( $(OPIEDIR)/include.pro )