Renaming StopppedState to StoppedState

Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index fa7c1919c66475360d0ff8939d63bef6497b0eda..1a75e8349cabbd87e06c87384920b3b9d8c1ef32 100644 (file)
--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -309,7 +309,7 @@ void QDeclarativeAudioEngine::updateSoundInstances()
     for (QList<QDeclarativeSoundInstance*>::Iterator it = m_managedDeclSoundInstances.begin();
          it != m_managedDeclSoundInstances.end();) {
         QDeclarativeSoundInstance *declSndInstance = *it;
-        if (declSndInstance->state() == QDeclarativeSoundInstance::StopppedState) {
+        if (declSndInstance->state() == QDeclarativeSoundInstance::StoppedState) {
             it = m_managedDeclSoundInstances.erase(it);
             releaseManagedDeclarativeSoundInstance(declSndInstance);
 #ifdef DEBUG_AUDIOENGINE

diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
index b5763df14370ddf5b129aabd7c2ad047a96fbc31..c29968f55b57cf68a5a18126412b3823e1da527b 100644 (file)
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
@@ -171,7 +171,7 @@ QDeclarativeSoundInstance::QDeclarativeSoundInstance(QObject *parent)
     , m_velocity(0, 0, 0)
     , m_gain(1)
     , m_pitch(1)
-    , m_requestState(QDeclarativeSoundInstance::StopppedState)
+    , m_requestState(QDeclarativeSoundInstance::StoppedState)
     , m_coneInnerAngle(360)
     , m_coneOuterAngle(360)
     , m_coneOuterGain(0)
@@ -343,7 +343,7 @@ void QDeclarativeSoundInstance::stop()
 #ifdef DEBUG_AUDIOENGINE
     qDebug() << "QDeclarativeSoundInstance::stop()";
 #endif
-    m_requestState = QDeclarativeSoundInstance::StopppedState;
+    m_requestState = QDeclarativeSoundInstance::StoppedState;
     if (!m_instance)
         return;
     m_instance->stop();

diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.h b/src/imports/audioengine/qdeclarative_soundinstance_p.h
index 0fd8c9a2050a8f3e43c78a40d30f5c426f2cd01f..d9157326276363a89ed796af4cee6a15e6bff345 100644 (file)
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.h
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.h
@@ -71,7 +71,7 @@ class QDeclarativeSoundInstance : public QObject
 public:
     enum State
     {
-        StopppedState = QSoundInstance::StopppedState,
+        StoppedState = QSoundInstance::StoppedState,
         PlayingState = QSoundInstance::PlayingState,
         PausedState = QSoundInstance::PausedState
     };

diff --git a/src/imports/audioengine/qsoundinstance_p.cpp b/src/imports/audioengine/qsoundinstance_p.cpp
index 9c5fc7ad90a6918e0886fc43ae63431a8bd555f3..a2effd9b04b89609449c5e0e94bb4a9aa048ad66 100644 (file)
--- a/src/imports/audioengine/qsoundinstance_p.cpp
+++ b/src/imports/audioengine/qsoundinstance_p.cpp
@@ -68,7 +68,7 @@ QSoundInstance::QSoundInstance(QObject *parent)
     , m_varGain(1)
     , m_pitch(1)
     , m_varPitch(1)
-    , m_state(QSoundInstance::StopppedState)
+    , m_state(QSoundInstance::StoppedState)
     , m_coneOuterGain(0)
     , m_engine(0)
 {
@@ -190,7 +190,7 @@ void QSoundInstance::handleSourceStateChanged(QSoundSource::State newState)
     State ns = State(newState);
     if (ns == m_state)
         return;
-    if (ns == QSoundInstance::StopppedState) {
+    if (ns == QSoundInstance::StoppedState) {
         prepareNewVariation();
     }
     setState(ns);
@@ -217,7 +217,7 @@ void QSoundInstance::sourceStop()
 {
     Q_ASSERT(m_soundSource);
     m_soundSource->stop();
-    setState(QSoundInstance::StopppedState);
+    setState(QSoundInstance::StoppedState);
 }
 
 void QSoundInstance::detach()
@@ -285,8 +285,8 @@ void QSoundInstance::sourcePause()
 
 void QSoundInstance::stop()
 {
-    if (!m_isReady || !m_soundSource || m_state == QSoundInstance::StopppedState) {
-        setState(QSoundInstance::StopppedState);
+    if (!m_isReady || !m_soundSource || m_state == QSoundInstance::StoppedState) {
+        setState(QSoundInstance::StoppedState);
         return;
     }
     sourceStop();

diff --git a/src/imports/audioengine/qsoundinstance_p.h b/src/imports/audioengine/qsoundinstance_p.h
index 6278627287c446f13ac2b4a439f9e1c82c50a9e0..b3309c569d5c747303bc39751ceae039f9b611d2 100644 (file)
--- a/src/imports/audioengine/qsoundinstance_p.h
+++ b/src/imports/audioengine/qsoundinstance_p.h
@@ -64,7 +64,7 @@ public:
 
     enum State
     {
-        StopppedState = QSoundSource::StoppedState,
+        StoppedState = QSoundSource::StoppedState,
         PlayingState = QSoundSource::PlayingState,
         PausedState = QSoundSource::PausedState
     };