From a0d39a2ab6c94cdb59a8009611669304372915e6 Mon Sep 17 00:00:00 2001 From: Jeff Tranter Date: Thu, 2 Jan 2014 13:36:12 -0500 Subject: [PATCH] Fix some typos in documentation. Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: Ieb7be17bd1d50751f00620f7ac28d09355856ac0 Reviewed-by: Yoann Lopes Reviewed-by: Sze Howe Koh --- src/multimedia/audio/qaudiodeviceinfo.cpp | 2 +- src/multimedia/controls/qcameraimageprocessingcontrol.cpp | 6 +++--- src/multimedia/doc/src/blackberry.qdoc | 2 +- src/multimedia/doc/src/changes.qdoc | 2 +- src/multimedia/playback/qmediaplaylist.cpp | 2 +- src/multimedia/video/qabstractvideobuffer.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 88d3089..ff31f35 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -127,7 +127,7 @@ public: order, channel, codec, frequency, sample rate, and sample type. A format is represented by the QAudioFormat class. - The values supported by the the device for each of these + The values supported by the device for each of these parameters can be fetched with supportedByteOrders(), supportedChannelCounts(), supportedCodecs(), supportedSampleRates(), supportedSampleSizes(), and diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index 7b2e3bb..f9cb8c8 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -120,8 +120,8 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() Returns true if the camera supports adjusting image processing \a parameter. - Usually the the supported settings is static, - but some parameter may not be available depending on other + Usually the supported setting is static, + but some parameters may not be available depending on other camera settings, like presets. In such case the currently supported parameters should be returned. */ @@ -129,7 +129,7 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() /*! \fn bool QCameraImageProcessingControl::isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const - Returns true if the camera supports settings the the image processing \a parameter \a value. + Returns true if the camera supports setting the image processing \a parameter \a value. It's used only for parameters with a limited set of values, like WhiteBalancePreset. */ diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc index 4b494cb..5af0636 100644 --- a/src/multimedia/doc/src/blackberry.qdoc +++ b/src/multimedia/doc/src/blackberry.qdoc @@ -59,7 +59,7 @@ supported in QMediaPlayer as well. Playlists as sources are also supported. mmrenderer does not allow access to the pixel data of video frames, hence Qt Multimedia classes like QVideoFrame and QAbstractVideoSurface will not work since they require access to the image data. QVideoWidget and the VideoOutput QML element are implemented with an overlay window; -mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application. +mmrenderer creates a separate window displaying a video and puts that on top of the Qt application. As a consequence, no other widget or QML element can be put on top of the video, and QML shaders have no effect. diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc index 10e9d92..d517ef4 100644 --- a/src/multimedia/doc/src/changes.qdoc +++ b/src/multimedia/doc/src/changes.qdoc @@ -125,7 +125,7 @@ changed in ways that may affect previously written code. This table highlights s you will probably need to remove them. \row \li QSoundEffect availability - \li The SoundEffect QML type was publically accessible in Qt Multimeda Kit, + \li The SoundEffect QML type was publicly accessible in Qt Multimeda Kit, and now the C++ version is officially public too. If your code contains the previously undocumented QSoundEffect, you may need to update it. \row diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp index 78f3450..68a8917 100644 --- a/src/multimedia/playback/qmediaplaylist.cpp +++ b/src/multimedia/playback/qmediaplaylist.cpp @@ -88,7 +88,7 @@ namespace like QMediaPlayer. QMediaPlaylist allows to access the service intrinsic playlist functionality - if available, otherwise it provides the the local memory playlist implementation. + if available, otherwise it provides the local memory playlist implementation. \snippet multimedia-snippets/media.cpp Movie playlist diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index e20c421..5f69382 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -78,7 +78,7 @@ namespace a new hardware accelerated video system, for example. The contents of a buffer can be accessed by mapping the buffer to memory using the map() - function, which returns a pointer to memory containing the contents of the the video buffer. + function, which returns a pointer to memory containing the contents of the video buffer. The memory returned by map() is released by calling the unmap() function. The handle() of a buffer may also be used to manipulate its contents using type specific APIs. -- 2.7.4