Rename namespace QtMultimedia -> QMultimedia
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:
committed by
The Qt Project
parent
13fd00199a
commit
832c3929f2
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user