slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename namespace QtMultimedia -> QMultimedia

Browse Source 
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 <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Sze Howe Koh
2012-11-01 00:33:21 +08:00
committed by The Qt Project
parent 13fd00199a
commit 832c3929f2
78 changed files with 381 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/multimedia/qmediaserviceprovider.cpp
View File

@@ -346,9 +346,9 @@ public:
}
break;
case QMediaServiceProviderHint::ContentType: {
QtMultimedia::SupportEstimate estimate = QtMultimedia::NotSupported;
QMultimedia::SupportEstimate estimate = QMultimedia::NotSupported;
foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
QtMultimedia::SupportEstimate currentEstimate = QtMultimedia::MaybeSupported;
QMultimedia::SupportEstimate currentEstimate = QMultimedia::MaybeSupported;
QMediaServiceSupportedFormatsInterface *iface =
qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
@@ -359,7 +359,7 @@ public:
estimate = currentEstimate;
plugin = currentPlugin;
if (currentEstimate == QtMultimedia::PreferredService)
if (currentEstimate == QMultimedia::PreferredService)
break;
}
}
@@ -390,7 +390,7 @@ public:
}
}
QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
QMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType,
const QString &mimeType,
const QStringList& codecs,
int flags) const
@@ -398,10 +398,10 @@ public:
QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
if (instances.isEmpty())
return QtMultimedia::NotSupported;
return QMultimedia::NotSupported;
bool allServicesProvideInterface = true;
QtMultimedia::SupportEstimate supportEstimate = QtMultimedia::NotSupported;
QMultimedia::SupportEstimate supportEstimate = QMultimedia::NotSupported;
foreach(QObject *obj, instances) {
QMediaServiceSupportedFormatsInterface *iface =
@@ -435,12 +435,12 @@ public:
}
//don't return PreferredService
supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported);
supportEstimate = qMin(supportEstimate, QMultimedia::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(QtMultimedia::MaybeSupported, supportEstimate);
supportEstimate = qMax(QMultimedia::MaybeSupported, supportEstimate);
return supportEstimate;
}
@@ -557,14 +557,14 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
*/
/*!
\fn QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
\fn QMultimedia::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 \a codecs while adhering to constraints
identified in \a flags.
*/
QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
QMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
const QString &mimeType,
const QStringList& codecs,
int flags) const
@@ -574,7 +574,7 @@ QtMultimedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray
Q_UNUSED(codecs);
Q_UNUSED(flags);
return QtMultimedia::MaybeSupported;
return QMultimedia::MaybeSupported;
}
/*!