summaryrefslogtreecommitdiff
authordrw <drw>2004-02-23 17:48:25 (UTC)
committer drw <drw>2004-02-23 17:48:25 (UTC)
commitf5762a3bee0ca4a176048f6552acaea2af827914 (patch) (unidiff)
treeeca9184b48500e886f2749c226d92e1a1b54f774
parentd18aa0e530d397737ff7591f99596108c9dca69b (diff)
downloadopie-f5762a3bee0ca4a176048f6552acaea2af827914.zip
opie-f5762a3bee0ca4a176048f6552acaea2af827914.tar.gz
opie-f5762a3bee0ca4a176048f6552acaea2af827914.tar.bz2
Oxygen: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/oxygen/config.in2
-rw-r--r--noncore/apps/oxygen/main.cpp3
-rw-r--r--noncore/apps/oxygen/opie-oxygen.control2
-rw-r--r--noncore/apps/oxygen/oxygen.pro14
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
@@ -1,4 +1,4 @@
1 config OXYGEN 1 config OXYGEN
2 boolean "opie-oxygen (Periodic System of the Elements)" 2 boolean "opie-oxygen (Periodic System of the Elements)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -6,19 +6,18 @@
6 email : cniehaus@handhelds.org 6 email : cniehaus@handhelds.org
7 **************************************************************************/ 7 **************************************************************************/
8 8
9/*************************************************************************** 9/***************************************************************************
10 * * 10 * *
11 * This program is free software; you can redistribute it and/or modify * 11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * ( at your option ) any later version. * 14 * ( at your option ) any later version. *
15 * * 15 * *
16 **************************************************************************/ 16 **************************************************************************/
17 17
18#include <opie2/oapplicationfactory.h>
18 19
19#include <qpe/qpeapplication.h>
20#include <opie/oapplicationfactory.h>
21#include "oxygen.h" 20#include "oxygen.h"
22 21
23 22
24OPIE_EXPORT_APP( OApplicationFactory<Oxygen> ) 23OPIE_EXPORT_APP( OApplicationFactory<Oxygen> )
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
@@ -1,10 +1,10 @@
1Package: opie-oxygen 1Package: opie-oxygen
2Files: plugins/application/liboxygen.so* bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/* 2Files: plugins/application/liboxygen.so* bin/oxygen apps/Applications/oxygen.desktop pics/oxygen/oxygen.png share/oxygen/*
3Priority: optional 3Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Carsten Niehaus <cniehaus@handhelds.org> 5Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: Periodic System of the Elements 8Description: Periodic System of the Elements
9 The chemistry application for the Opie-environment 9 The chemistry application for the Opie-environment
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $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,27 +1,27 @@
1 CONFIG = qt warn_on release quick-app 1CONFIG = qt warn_on release quick-app
2 HEADERS = oxygen.h \ 2HEADERS = oxygen.h \
3 kmolcalc.h \ 3 kmolcalc.h \
4 kmolelements.h \ 4 kmolelements.h \
5 calcdlgui.h \ 5 calcdlgui.h \
6 dataTable.h \ 6 dataTable.h \
7 psewidget.h \ 7 psewidget.h \
8 oxyframe.h \ 8 oxyframe.h \
9 datawidgetui.h 9 datawidgetui.h
10 10
11 SOURCES = main.cpp \ 11SOURCES = main.cpp \
12 oxygen.cpp \ 12 oxygen.cpp \
13 kmolcalc.cpp \ 13 kmolcalc.cpp \
14 calcdlgui.cpp \ 14 calcdlgui.cpp \
15 kmolelements.cpp \ 15 kmolelements.cpp \
16 dataTable.cpp \ 16 dataTable.cpp \
17 psewidget.cpp \ 17 psewidget.cpp \
18 oxyframe.cpp \ 18 oxyframe.cpp \
19 datawidgetui.cpp 19 datawidgetui.cpp
20INCLUDEPATH += $(OPIEDIR)/include 20INCLUDEPATH += $(OPIEDIR)/include
21DEPENDPATH += $(OPIEDIR)/include 21DEPENDPATH += $(OPIEDIR)/include
22 LIBS += -lqpe 22LIBS += -lqpe -lopiecore2
23 INTERFACES= calcdlg.ui 23INTERFACES = calcdlg.ui
24 24
25 TARGET= oxygen 25TARGET = oxygen
26 26
27include ( $(OPIEDIR)/include.pro ) 27include ( $(OPIEDIR)/include.pro )