Move most of playlist API to private.

Moved objects either not needed to be public or require API review/redesign.

Change-Id: Ibeb8b8c9c9a74bea32191c119fa4daaffde57c17
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

5 files changed, 42 insertions, 15 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index c9fd7252d..69094f766 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -20,8 +20,6 @@ PUBLIC_HEADERS += \
     controls/qmediagaplessplaybackcontrol.h \
     controls/qmedianetworkaccesscontrol.h \
     controls/qmediaplayercontrol.h \
-    controls/qmediaplaylistcontrol.h \
-    controls/qmediaplaylistsourcecontrol.h \
     controls/qmediarecordercontrol.h \
     controls/qmediastreamscontrol.h \
     controls/qmetadatareadercontrol.h \
@@ -36,7 +34,9 @@ PUBLIC_HEADERS += \
     controls/qmediaavailabilitycontrol.h
 
 PRIVATE_HEADERS += \
-    controls/qaudiodecodercontrol_p.h
+    controls/qaudiodecodercontrol_p.h \
+    controls/qmediaplaylistcontrol_p.h \
+    controls/qmediaplaylistsourcecontrol_p.h
 
 SOURCES += \
     controls/qaudioencodercontrol.cpp \
diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp
index f3d6cdab1..c33485512 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp
@@ -40,13 +40,15 @@
 ****************************************************************************/
 
 
-#include "qmediaplaylistcontrol.h"
+#include "qmediaplaylistcontrol_p.h"
 #include "qmediacontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistControl
+    \internal
+
     \inmodule QtMultimedia
 
     \ingroup multimedia
@@ -201,6 +203,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl()
   Signal emitted when current media changes to \a content.
 */
 
-#include "moc_qmediaplaylistcontrol.cpp"
+#include "moc_qmediaplaylistcontrol_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/controls/qmediaplaylistcontrol.h b/src/multimedia/controls/qmediaplaylistcontrol_p.h
index 952e0d1c1..ac2b57f17 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h
@@ -40,11 +40,23 @@
 ****************************************************************************/
 
 
-#ifndef QMEDIAPLAYLISTCONTROL_H
-#define QMEDIAPLAYLISTCONTROL_H
-
+#ifndef QMEDIAPLAYLISTCONTROL_P_H
+#define QMEDIAPLAYLISTCONTROL_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.
+//
+
+#include <QtCore/qobject.h>
 #include "qmediacontrol.h"
-#include "qmediaplaylistnavigator.h"
+#include <private/qmediaplaylistnavigator_p.h>
 
 
 QT_BEGIN_HEADER
@@ -95,4 +107,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTCONTROL_H
+#endif // QMEDIAPLAYLISTCONTROL_P_H
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
index 17f5ade1f..e9e815646 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
@@ -40,13 +40,15 @@
 ****************************************************************************/
 
 
-#include "qmediaplaylistsourcecontrol.h"
+#include "qmediaplaylistsourcecontrol_p.h"
 #include "qmediacontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistSourceControl
+    \internal
+
     \inmodule QtMultimedia
 
     \ingroup multimedia
@@ -121,6 +123,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl()
   Signal emitted when the playlist has changed to \a playlist.
 */
 
-#include "moc_qmediaplaylistsourcecontrol.cpp"
+#include "moc_qmediaplaylistsourcecontrol_p.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
index 428bca2a3..be7d8a234 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
@@ -40,8 +40,19 @@
 ****************************************************************************/
 
 
-#ifndef QMEDIAPLAYLISTSOURCECONTROL_H
-#define QMEDIAPLAYLISTSOURCECONTROL_H
+#ifndef QMEDIAPLAYLISTSOURCECONTROL_P_H
+#define QMEDIAPLAYLISTSOURCECONTROL_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.
+//
 
 #include <qmediacontrol.h>
 
@@ -79,4 +90,4 @@ QT_END_NAMESPACE
 QT_END_HEADER
 
 
-#endif // QMEDIAPLAYLISTCONTROL_H
+#endif // QMEDIAPLAYLISTCONTROL_P_H