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>
This commit is contained in:
Lev Zelenskiy
2012-03-06 12:23:09 +10:00
committed by Qt by Nokia
parent cb39035162
commit 10b0063401
29 changed files with 171 additions and 177 deletions

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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