slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename namespace QtMultimedia -> QMultimedia

Browse Source 
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Sze Howe Koh
2012-11-01 00:33:21 +08:00
committed by The Qt Project
parent 13fd00199a
commit 832c3929f2
78 changed files with 381 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/multimedia/playback/qmediaplayer.cpp
View File

@@ -913,7 +913,7 @@ void QMediaPlayer::unbind(QObject *obj)
The \a flags argument allows additional requirements such as performance indicators to be
specified.
*/
QtMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
QMultimedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
const QStringList& codecs,
Flags flags)
{
@@ -1013,12 +1013,12 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
}
/*! \reimp */
QtMultimedia::AvailabilityStatus QMediaPlayer::availability() const
QMultimedia::AvailabilityStatus QMediaPlayer::availability() const
{
Q_D(const QMediaPlayer);
if (!d->control)
return QtMultimedia::ServiceMissing;
return QMultimedia::ServiceMissing;
return QMediaObject::availability();
}

4
src/multimedia/playback/qmediaplayer.h
View File

@@ -124,7 +124,7 @@ public:
QMediaPlayer(QObject *parent = 0, Flags flags = 0);
~QMediaPlayer();
static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,
static QMultimedia::SupportEstimate hasSupport(const QString &mimeType,
const QStringList& codecs = QStringList(),
Flags flags = 0);
static QStringList supportedMimeTypes(Flags flags = 0);
@@ -159,7 +159,7 @@ public:
QNetworkConfiguration currentNetworkConfiguration() const;
QtMultimedia::AvailabilityStatus availability() const;
QMultimedia::AvailabilityStatus availability() const;
public Q_SLOTS:
void play();