summaryrefslogtreecommitdiff
authordrw <drw>2004-02-22 00:28:41 (UTC)
committer drw <drw>2004-02-22 00:28:41 (UTC)
commit69b33f76ffff03b3648db62a761f3de1b58eec3f (patch) (unidiff)
tree3c0d6d559e67a982f1a2c36522b80ab47fb36d3f
parent7e25ffee3337376d60c9c382bda4664672fec5de (diff)
downloadopie-69b33f76ffff03b3648db62a761f3de1b58eec3f.zip
opie-69b33f76ffff03b3648db62a761f3de1b58eec3f.tar.gz
opie-69b33f76ffff03b3648db62a761f3de1b58eec3f.tar.bz2
VMemo Settings: libopie->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/main.cpp3
-rw-r--r--noncore/settings/sound/opie-vmemo-settings.control2
-rw-r--r--noncore/settings/sound/sound.pro2
3 files changed, 3 insertions, 4 deletions
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index d919ce4..49497c3 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -1,29 +1,28 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "soundsettings.h" 21#include "soundsettings.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <opie2/oapplicationfactory.h>
24#include <opie/oapplicationfactory.h>
25 24
26OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) 25OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
27 26
28 27
29 28
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control
index 2fdbc0c..906bcbf 100644
--- a/noncore/settings/sound/opie-vmemo-settings.control
+++ b/noncore/settings/sound/opie-vmemo-settings.control
@@ -1,12 +1,12 @@
1Package: opie-vmemo-settings 1Package: opie-vmemo-settings
2Files: plugins/application/libsound.so* bin/sound apps/Settings/Sound.desktop 2Files: plugins/application/libsound.so* bin/sound apps/Settings/Sound.desktop
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Maintainer: L.J. Potter <lpotter@trolltech.com> 5Maintainer: L.J. Potter <lpotter@trolltech.com>
6Architecture: arm 6Architecture: arm
7Arch: iPAQ 7Arch: iPAQ
8Conflicts: opie-sound 8Conflicts: opie-sound
9Depends: task-opie-minimal 9Depends: task-opie-minimal, liopiecore2
10Description: Sound settings dialog 10Description: Sound settings dialog
11 For the Opie environment. 11 For the Opie environment.
12Version: $QPE_VERSION$EXTRAVERSION 12Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro
index cdcf8d6..9925e5b 100644
--- a/noncore/settings/sound/sound.pro
+++ b/noncore/settings/sound/sound.pro
@@ -1,10 +1,10 @@
1CONFIG += qt warn_on release quick-app 1CONFIG += qt warn_on release quick-app
2HEADERS = soundsettings.h soundsettingsbase.h 2HEADERS = soundsettings.h soundsettingsbase.h
3SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp 3SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp
4#INTERFACES = soundsettingsbase.ui 4#INTERFACES = soundsettingsbase.ui
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe 7LIBS += -lqpe -lopiecore2
8TARGET = sound 8TARGET = sound
9 9
10include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )