diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 07:05:50 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-19 07:05:50 (GMT) |
| commit | 723d412d2b3fcb2f64594ff75ad94d469285aeb1 (patch) | |
| tree | 2bf811bfbd59be616599a9d10a2aa7db60e05c01 /src/multimedia/base | |
| parent | 6fa813a4d5b46523940f6af8ed74e6855bad49c9 (diff) | |
| download | Qt-723d412d2b3fcb2f64594ff75ad94d469285aeb1.zip Qt-723d412d2b3fcb2f64594ff75ad94d469285aeb1.tar.gz Qt-723d412d2b3fcb2f64594ff75ad94d469285aeb1.tar.bz2 | |
Complete namespace move; QtMedia -> QtMultimedia
Diffstat (limited to 'src/multimedia/base')
| -rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/base/qmetadatacontrol.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index fcf06d3..8d1e0fa 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -509,7 +509,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); */ /*! - \fn QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const + \fn QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const Returns how confident a media service provider is that is can provide a \a serviceType service that is able to play media of a specific \a mimeType that is encoded using the listed diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/base/qmetadatacontrol.cpp index e45bb0c..3ecbe8d 100644 --- a/src/multimedia/base/qmetadatacontrol.cpp +++ b/src/multimedia/base/qmetadatacontrol.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE its current media it will implement QMetaDataControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the well defined keys in the - QtMedia::MetaData enumeration using the metaData() functions, or by + QtMultimedia::MetaData enumeration using the metaData() functions, or by string keys using the extendedMetaData() functions. The functionality provided by this control is exposed to application @@ -117,13 +117,13 @@ QMetaDataControl::~QMetaDataControl() */ /*! - \fn QVariant QMetaDataControl::metaData(QtMedia::MetaData key) const + \fn QVariant QMetaDataControl::metaData(QtMultimedia::MetaData key) const Returns the meta-data for the given \a key. */ /*! - \fn void QMetaDataControl::setMetaData(QtMedia::MetaData key, const QVariant &value) + \fn void QMetaDataControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value) Sets the \a value of the meta-data element with the given \a key. */ |