From f5762a3bee0ca4a176048f6552acaea2af827914 Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Mon, 23 Feb 2004 17:48:25 +0000
Subject: Oxygen: libopie->libopie2

---
(limited to 'noncore')

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
@@ -1,4 +1,4 @@
   config OXYGEN
     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
@@ -15,9 +15,8 @@
  *                                                                         *
  **************************************************************************/
 
+#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
@@ -4,7 +4,7 @@ Priority: optional
 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
 Version: $QPE_VERSION$EXTRAVERSION
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,5 +1,5 @@
-CONFIG		= qt warn_on release quick-app
-HEADERS		= oxygen.h \
+CONFIG        = qt warn_on release quick-app
+HEADERS        = oxygen.h \
             kmolcalc.h \
             kmolelements.h \
             calcdlgui.h \
@@ -8,8 +8,8 @@ HEADERS		= oxygen.h \
             oxyframe.h \
             datawidgetui.h
 
-SOURCES		= main.cpp \
-		  oxygen.cpp \
+SOURCES        = main.cpp \
+          oxygen.cpp \
           kmolcalc.cpp \
           calcdlgui.cpp \
           kmolelements.cpp \
@@ -19,9 +19,9 @@ SOURCES		= main.cpp \
           datawidgetui.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 )
--
cgit v0.9.0.2