diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-05 01:48:55 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-05 01:56:09 (GMT) |
| commit | 5278c12ff3c6d8e467fe4034120e258fdaa90b80 (patch) | |
| tree | f25bc8a58c5c7cbe6dff2dea6a2cb67df7d360cc | |
| parent | c4cc1998b42b61f6389c372dcb572f2e5d5dcc08 (diff) | |
| download | Qt-5278c12ff3c6d8e467fe4034120e258fdaa90b80.zip Qt-5278c12ff3c6d8e467fe4034120e258fdaa90b80.tar.gz Qt-5278c12ff3c6d8e467fe4034120e258fdaa90b80.tar.bz2 | |
Fix spelling in enumeration.
Reviewed-by: Dmytro Poplavskiy
| -rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/base/qtmedianamespace.h | 2 | ||||
| -rw-r--r-- | src/multimedia/base/qtmedianamespace.qdoc | 2 | ||||
| -rw-r--r-- | tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 6e11079..b089b39 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -350,7 +350,7 @@ public: estimate = currentEstimate; plugin = currentPlugin; - if (currentEstimate == QtMultimedia::PreferedService) + if (currentEstimate == QtMultimedia::PreferredService) break; } } @@ -426,7 +426,7 @@ public: allServicesProvideInterface = false; } - //don't return PreferedService + //don't return PreferredService supportEstimate = qMin(supportEstimate, QtMultimedia::ProbablySupported); //Return NotSupported only if no services are available of serviceType diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/base/qtmedianamespace.h index 2a56fc3..fe20a05 100644 --- a/src/multimedia/base/qtmedianamespace.h +++ b/src/multimedia/base/qtmedianamespace.h @@ -152,7 +152,7 @@ namespace QtMultimedia NotSupported, MaybeSupported, ProbablySupported, - PreferedService + PreferredService }; enum EncodingQuality diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/base/qtmedianamespace.qdoc index 270c7d6..58e9c92 100644 --- a/src/multimedia/base/qtmedianamespace.qdoc +++ b/src/multimedia/base/qtmedianamespace.qdoc @@ -172,7 +172,7 @@ \value NotSupported The feature is not supported. \value MaybeSupported The feature may be supported. \value ProbablySupported The feature is probably supported. - \value PreferedService The service is the preferred provider of a service. + \value PreferredService The service is the preferred provider of a service. */ /*! diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index d839fe5..06a8f60 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -152,7 +152,7 @@ public: Q_UNUSED(codecs); if (mimeType == "audio/wav") - return QtMultimedia::PreferedService; + return QtMultimedia::PreferredService; return QtMultimedia::NotSupported; } |