diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-17 12:12:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 05:10:21 +0200 |
| commit | d414247afecf2d2bad4cce47813099c515005e3e (patch) | |
| tree | 87e6acc13ae46004b9b0d68ef1c11f40884b3620 /src/multimedia | |
| parent | 21fbb1d02509df805234f30d94e200a1f76fab4e (diff) | |
Make the C++ API of QSoundEffect public.
The QML API already was. The C++ API still needs good documentation,
though.
Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/effects/effects.pri | 4 | ||||
| -rw-r--r-- | src/multimedia/effects/qsoundeffect.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/effects/qsoundeffect.h (renamed from src/multimedia/effects/qsoundeffect_p.h) | 15 | ||||
| -rw-r--r-- | src/multimedia/effects/qsoundeffect_pulse_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/effects/qsoundeffect_qmedia_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/effects/qsoundeffect_qsound_p.h | 2 |
6 files changed, 10 insertions, 20 deletions
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri index 48c9906b6..9b8fbede5 100644 --- a/src/multimedia/effects/effects.pri +++ b/src/multimedia/effects/effects.pri @@ -23,8 +23,10 @@ unix:!mac { SOURCES += effects/qsoundeffect_qmedia_p.cpp } +PUBLIC_HEADERS += \ + effects/qsoundeffect.h + PRIVATE_HEADERS += \ - effects/qsoundeffect_p.h \ effects/qwavedecoder_p.h \ effects/qsamplecache_p.h diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp index b1137a22e..e95909587 100644 --- a/src/multimedia/effects/qsoundeffect.cpp +++ b/src/multimedia/effects/qsoundeffect.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qsoundeffect_p.h" +#include "qsoundeffect.h" #if defined(QT_MULTIMEDIA_PULSEAUDIO) #include "qsoundeffect_pulse_p.h" @@ -159,7 +159,6 @@ QT_BEGIN_NAMESPACE /*! - \internal \since 1.0 */ @@ -298,4 +297,4 @@ void QSoundEffect::stop() QT_END_NAMESPACE -#include "moc_qsoundeffect_p.cpp" +#include "moc_qsoundeffect.cpp" diff --git a/src/multimedia/effects/qsoundeffect_p.h b/src/multimedia/effects/qsoundeffect.h index 93248184a..bac325d9c 100644 --- a/src/multimedia/effects/qsoundeffect_p.h +++ b/src/multimedia/effects/qsoundeffect.h @@ -39,19 +39,8 @@ ** ****************************************************************************/ -#ifndef QSOUNDEFFECT_P_H -#define QSOUNDEFFECT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// +#ifndef QSOUNDEFFECT_H +#define QSOUNDEFFECT_H #include <qtmultimediadefs.h> #include <QtCore/qobject.h> diff --git a/src/multimedia/effects/qsoundeffect_pulse_p.h b/src/multimedia/effects/qsoundeffect_pulse_p.h index c78bcdec5..eaf78e8dd 100644 --- a/src/multimedia/effects/qsoundeffect_pulse_p.h +++ b/src/multimedia/effects/qsoundeffect_pulse_p.h @@ -54,7 +54,7 @@ // -#include "qsoundeffect_p.h" +#include "qsoundeffect.h" #include <QtCore/qobject.h> #include <QtCore/qdatetime.h> diff --git a/src/multimedia/effects/qsoundeffect_qmedia_p.h b/src/multimedia/effects/qsoundeffect_qmedia_p.h index adafa04a2..3e448f718 100644 --- a/src/multimedia/effects/qsoundeffect_qmedia_p.h +++ b/src/multimedia/effects/qsoundeffect_qmedia_p.h @@ -56,7 +56,7 @@ #include <QtCore/qobject.h> #include <QtCore/qurl.h> #include "qmediaplayer.h" -#include "qsoundeffect_p.h" +#include "qsoundeffect.h" QT_BEGIN_HEADER diff --git a/src/multimedia/effects/qsoundeffect_qsound_p.h b/src/multimedia/effects/qsoundeffect_qsound_p.h index c98ad79ce..e867bf477 100644 --- a/src/multimedia/effects/qsoundeffect_qsound_p.h +++ b/src/multimedia/effects/qsoundeffect_qsound_p.h @@ -56,7 +56,7 @@ #include <QtCore/qobject.h> #include <QtCore/qurl.h> -#include "qsoundeffect_p.h" +#include "qsoundeffect.h" QT_BEGIN_HEADER |