From 4ce9d89d7a315100393aeae9998a8f9e838650ca Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 11 Feb 2015 10:05:21 +0100 Subject: [PATCH] Fix some typos Change-Id: Iaf8f50741d3103480668b4a654a202d8a363bc45 Reviewed-by: Yoann Lopes --- src/imports/audioengine/qdeclarative_audiosample_p.cpp | 8 ++++---- src/imports/audioengine/qdeclarative_sound_p.cpp | 8 ++++---- src/imports/multimedia/qdeclarativecamera.cpp | 2 +- src/imports/multimedia/qdeclarativecameracapture.cpp | 2 +- src/multimedia/camera/qcameraimagecapture.cpp | 2 +- src/multimedia/controls/qcameraimagecapturecontrol.cpp | 2 +- src/multimedia/doc/src/blackberry.qdoc | 2 +- src/multimedia/playback/qmediaplayer.cpp | 2 +- src/multimedia/video/qvideoprobe.cpp | 2 +- src/plugins/windowsaudio/qwindowsaudioinput.cpp | 2 +- src/plugins/wmf/player/mfplayersession.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp index 29c4ffe..69ec8a2 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp @@ -114,7 +114,7 @@ QUrl QDeclarativeAudioSample::source() const void QDeclarativeAudioSample::setSource(const QUrl& url) { if (m_complete) { - qWarning("AudioSample: source not changable after initialization."); + qWarning("AudioSample: source not changeable after initialization."); return; } m_url = url; @@ -170,7 +170,7 @@ void QDeclarativeAudioSample::load() void QDeclarativeAudioSample::setPreloaded(bool preloaded) { if (m_complete) { - qWarning("AudioSample: preloaded not changable after initialization."); + qWarning("AudioSample: preloaded not changeable after initialization."); return; } m_preloaded = preloaded; @@ -179,7 +179,7 @@ void QDeclarativeAudioSample::setPreloaded(bool preloaded) void QDeclarativeAudioSample::setStreaming(bool streaming) { if (m_complete) { - qWarning("AudioSample: streaming not changable after initialization."); + qWarning("AudioSample: streaming not changeable after initialization."); return; } m_streaming = streaming; @@ -199,7 +199,7 @@ QString QDeclarativeAudioSample::name() const void QDeclarativeAudioSample::setName(const QString& name) { if (m_complete) { - qWarning("AudioSample: name not changable after initialization."); + qWarning("AudioSample: name not changeable after initialization."); return; } m_name = name; diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp index 6286e9e..c55f702 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.cpp +++ b/src/imports/audioengine/qdeclarative_sound_p.cpp @@ -239,7 +239,7 @@ QDeclarativeSound::PlayType QDeclarativeSound::playType() const void QDeclarativeSound::setPlayType(PlayType playType) { if (m_complete) { - qWarning("Sound: playType not changable after initialization."); + qWarning("Sound: playType not changeable after initialization."); return; } m_playType = playType; @@ -258,7 +258,7 @@ QString QDeclarativeSound::category() const void QDeclarativeSound::setCategory(const QString& category) { if (m_complete) { - qWarning("Sound: category not changable after initialization."); + qWarning("Sound: category not changeable after initialization."); return; } m_category = category; @@ -278,7 +278,7 @@ QString QDeclarativeSound::name() const void QDeclarativeSound::setName(const QString& name) { if (m_complete) { - qWarning("Sound: category not changable after initialization."); + qWarning("Sound: category not changeable after initialization."); return; } m_name = name; @@ -322,7 +322,7 @@ QDeclarativePlayVariation* QDeclarativeSound::getVariation(int index) void QDeclarativeSound::setAttenuationModel(QString attenuationModel) { if (m_complete) { - qWarning("Sound: attenuationModel not changable after initialization."); + qWarning("Sound: attenuationModel not changeable after initialization."); return; } m_attenuationModel = attenuationModel; diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 61ac518..c911c5e 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -925,7 +925,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) \qmlproperty variant QtMultimedia::Camera::metaData.gpsLongitude \qmlproperty variant QtMultimedia::Camera::metaData.gpsAltitude - These properties hold the the geographic position in decimal degrees of the + These properties hold the geographic position in decimal degrees of the camera at time of capture. \sa {QMediaMetaData} diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp index 79121a2..f70429c 100644 --- a/src/imports/multimedia/qdeclarativecameracapture.cpp +++ b/src/imports/multimedia/qdeclarativecameracapture.cpp @@ -153,7 +153,7 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const for video. Camera saves all the capture parameters like exposure settings or - image processing parameters, so changes to camera paramaters after + image processing parameters, so changes to camera parameters after capture() is called do not affect previous capture requests. capture() returns the capture requestId parameter, used with diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 3413176..8979637 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -520,7 +520,7 @@ bool QCameraImageCapture::isReadyForCapture() const the default directory, with a full path reported with imageCaptured() and imageSaved() signals. QCamera saves all the capture parameters like exposure settings or - image processing parameters, so changes to camera paramaters after + image processing parameters, so changes to camera parameters after capture() is called do not affect previous capture requests. QCameraImageCapture::capture returns the capture Id parameter, used with diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index b05c423..ebeb7c5 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -111,7 +111,7 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() The Camera service should save all the capture parameters like exposure settings or image processing parameters, - so changes to camera paramaters after capture() is called + so changes to camera parameters after capture() is called do not affect previous capture requests. Returns the capture request id number, which is used later diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc index 48616a2..3eab285 100644 --- a/src/multimedia/doc/src/blackberry.qdoc +++ b/src/multimedia/doc/src/blackberry.qdoc @@ -31,7 +31,7 @@ \brief Platform notes for the BlackBerry Platform Qt Multimedia supports BlackBerry devices that run the BB10 operating system. -This page covers the availibility of different features on BB10. +This page covers the availability of different features on BB10. \section1 Implementation diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 66aec7c..8f8399d 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -335,7 +335,7 @@ void QMediaPlayerPrivate::setPlaylistMedia() return; } else if (control != 0) { // If we've just switched to a new playlist, - // then last emited currentMediaChanged was a playlist. + // then last emitted currentMediaChanged was a playlist. // Make sure we emit currentMediaChanged if new playlist has // the same media as the previous one: // sample.m3u diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp index 496b324..e789baa 100644 --- a/src/multimedia/video/qvideoprobe.cpp +++ b/src/multimedia/video/qvideoprobe.cpp @@ -51,7 +51,7 @@ player->setVideoOutput(myVideoSurface); player->setMedia(QUrl::fromLocalFile("observation.mp4")); - player->play(); // Start receving frames as they get presented to myVideoSurface + player->play(); // Start receiving frames as they get presented to myVideoSurface \endcode This same approach works with the QCamera object as well, to receive viewfinder or video diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp index 2a3d342..b44f206 100644 --- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp +++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp @@ -428,7 +428,7 @@ void QWindowsAudioInput::initMixer() return; mixerID = (HMIXEROBJ)mixerIntID; - // Get the Destination (Recording) Line Infomation + // Get the Destination (Recording) Line Information MIXERLINE mixerLine; mixerLine.cbStruct = sizeof(MIXERLINE); mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN; diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index a01c0b9..789d78b 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -1296,7 +1296,7 @@ void MFPlayerSession::commitRateChange(qreal rate, BOOL isThin) // (which might be earlier than the last decoded key frame) resetPosition = true; } else if (cmdNow == CmdPause) { - // If paused, dont reset the position until we resume, otherwise + // If paused, don't reset the position until we resume, otherwise // a new frame will be rendered m_presentationClock->GetCorrelatedTime(0, &hnsClockTime, &hnsSystemTime); m_request.setCommand(CmdSeekResume); -- 2.7.4