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>

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 20333f2..cabf8fd 100644 (file)
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -43,7 +43,7 @@
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
-#include "private/qsoundeffect_p.h"
+#include "qsoundeffect.h"
 
 #include "qdeclarativemediametadata_p.h"
 #include "qdeclarativeaudio_p.h"

diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri
index 48c9906..9b8fbed 100644 (file)
--- 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 b1137a2..e959095 100644 (file)
--- 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
similarity index 92%
rename from src/multimedia/effects/qsoundeffect_p.h
rename to src/multimedia/effects/qsoundeffect.h
index 9324818..bac325d 100644 (file)
--- 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 c78bcde..eaf78e8 100644 (file)
--- 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 adafa04..3e448f7 100644 (file)
--- 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 c98ad79..e867bf4 100644 (file)
--- 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
 

diff --git a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/qsoundeffect/tst_qsoundeffect.cpp
index 7e39c0f..b379762 100644 (file)
--- a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp
+++ b/tests/auto/qsoundeffect/tst_qsoundeffect.cpp
@@ -46,7 +46,7 @@
 #include <qaudiooutput.h>
 #include <qaudiodeviceinfo.h>
 #include <qaudio.h>
-#include "private/qsoundeffect_p.h"
+#include "qsoundeffect.h"
 
 
 class tst_QSoundEffect : public QObject