From 832c3929f2222e0e10ada33549c9d1cf90373018 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Thu, 1 Nov 2012 00:33:21 +0800 Subject: 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 Reviewed-by: Stephen Kelly --- src/plugins/qt7/qt7serviceplugin.h | 2 +- src/plugins/qt7/qt7serviceplugin.mm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/qt7') diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h index 889b717b5..4e5258b49 100644 --- a/src/plugins/qt7/qt7serviceplugin.h +++ b/src/plugins/qt7/qt7serviceplugin.h @@ -63,7 +63,7 @@ public: void release(QMediaService *service); QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; QStringList supportedMimeTypes() const; private: diff --git a/src/plugins/qt7/qt7serviceplugin.mm b/src/plugins/qt7/qt7serviceplugin.mm index b5acd4237..9c10cc3cf 100644 --- a/src/plugins/qt7/qt7serviceplugin.mm +++ b/src/plugins/qt7/qt7serviceplugin.mm @@ -87,14 +87,14 @@ QMediaServiceProviderHint::Features QT7ServicePlugin::supportedFeatures( return QMediaServiceProviderHint::Features(); } -QtMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const +QMultimedia::SupportEstimate QT7ServicePlugin::hasSupport(const QString &mimeType, const QStringList& codecs) const { Q_UNUSED(codecs); if (m_supportedMimeTypes.contains(mimeType)) - return QtMultimedia::ProbablySupported; + return QMultimedia::ProbablySupported; - return QtMultimedia::MaybeSupported; + return QMultimedia::MaybeSupported; } QStringList QT7ServicePlugin::supportedMimeTypes() const -- cgit v1.2.3