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/gsttools/qgstutils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gsttools') diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 7a81c2875..ce7cf9f04 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -358,12 +358,12 @@ namespace { } } -QtMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType, +QMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType, const QStringList &codecs, const QSet &supportedMimeTypeSet) { if (supportedMimeTypeSet.isEmpty()) - return QtMultimedia::NotSupported; + return QMultimedia::NotSupported; QString mimeTypeLowcase = mimeType.toLower(); bool containsMimeType = supportedMimeTypeSet.contains(mimeTypeLowcase); @@ -393,12 +393,12 @@ QtMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType, } } if (supportedCodecCount > 0 && supportedCodecCount == codecs.size()) - return QtMultimedia::ProbablySupported; + return QMultimedia::ProbablySupported; if (supportedCodecCount == 0 && !containsMimeType) - return QtMultimedia::NotSupported; + return QMultimedia::NotSupported; - return QtMultimedia::MaybeSupported; + return QMultimedia::MaybeSupported; } QT_END_NAMESPACE -- cgit v1.2.3