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 --- .../mockserviceplugin4/mockserviceplugin4.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp') diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp index 9694040b9..1982c5cd1 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.cpp @@ -70,15 +70,15 @@ public: delete service; } - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const { if (codecs.contains(QLatin1String("jpeg2000"))) - return QtMultimedia::NotSupported; + return QMultimedia::NotSupported; if (supportedMimeTypes().contains(mimeType)) - return QtMultimedia::ProbablySupported; + return QMultimedia::ProbablySupported; - return QtMultimedia::MaybeSupported; + return QMultimedia::MaybeSupported; } QStringList supportedMimeTypes() const -- cgit v1.2.3