diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 06:16:44 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 06:16:44 (GMT) |
commit | f80b82ed61bece1843c6ae011fb5678ba8210949 (patch) | |
tree | 9c7cf3c697d2b046832d7422e2afe95e25d3a052 /src/multimedia/base/qmediaserviceprovider.cpp | |
parent | 50fe29b569849d05db1625fa30fbd8618a941c5a (diff) | |
download | Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.zip Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.gz Qt-f80b82ed61bece1843c6ae011fb5678ba8210949.tar.bz2 |
Change namespace; QtMedia -> QtMultimedia
Diffstat (limited to 'src/multimedia/base/qmediaserviceprovider.cpp')
-rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 3b8dd2c..fcf06d3 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -333,9 +333,9 @@ public: } break; case QMediaServiceProviderHint::ContentType: { - QtMedia::SupportEstimate estimate = QtMedia::NotSupported; + QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported; foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) { - QtMedia::SupportEstimate currentEstimate = QtMedia::MaybeSupported; + QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported; QMediaServiceSupportedFormatsInterface *iface = qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin); @@ -346,7 +346,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMedia::PreferedService) + if (currentEstimate == QtMultimedia::PreferedService) break; } } @@ -377,7 +377,7 @@ public: } } - QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType, + QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -385,10 +385,10 @@ public: QList<QObject*> instances = loader()->instances(serviceType); if (instances.isEmpty()) - return QtMedia::NotSupported; + return QtMultimedia::NotSupported; bool allServicesProvideInterface = true; - QtMedia::SupportEstimate supportEstimate = QtMedia::NotSupported; + QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported; foreach(QObject *obj, instances) { QMediaServiceSupportedFormatsInterface *iface = @@ -411,12 +411,12 @@ public: } //don't return PreferedService - supportEstimate = qMin(supportEstimate, QtMedia::ProbablySupported); + supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); //Return NotSupported only if no services are available of serviceType //or all the services returned NotSupported, otherwise return at least MaybeSupported if (!allServicesProvideInterface) - supportEstimate = qMax(QtMedia::MaybeSupported, supportEstimate); + supportEstimate = qMax(QtMultimedia::MaybeSupported, supportEstimate); return supportEstimate; } @@ -515,7 +515,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); service that is able to play media of a specific \a mimeType that is encoded using the listed \a codecs while adhearing to constraints identified in \a flags. */ -QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, +QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const @@ -525,7 +525,7 @@ QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &ser Q_UNUSED(codecs); Q_UNUSED(flags); - return QtMedia::MaybeSupported; + return QtMultimedia::MaybeSupported; } /*! |