Renaming StopppedState to StoppedState
authorAngus Cummings <angus.cummings@nokia.com>
Thu, 7 Jun 2012 01:01:28 +0000 (11:01 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 13 Jun 2012 03:53:47 +0000 (05:53 +0200)
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
src/imports/audioengine/qdeclarative_audioengine_p.cpp
src/imports/audioengine/qdeclarative_soundinstance_p.cpp
src/imports/audioengine/qdeclarative_soundinstance_p.h
src/imports/audioengine/qsoundinstance_p.cpp
src/imports/audioengine/qsoundinstance_p.h

index fa7c191..1a75e83 100644 (file)
@@ -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
index b5763df..c29968f 100644 (file)
@@ -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();
index 0fd8c9a..d915732 100644 (file)
@@ -71,7 +71,7 @@ class QDeclarativeSoundInstance : public QObject
 public:
     enum State
     {
-        StopppedState = QSoundInstance::StopppedState,
+        StoppedState = QSoundInstance::StoppedState,
         PlayingState = QSoundInstance::PlayingState,
         PausedState = QSoundInstance::PausedState
     };
index 9c5fc7a..a2effd9 100644 (file)
@@ -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();
index 6278627..b3309c5 100644 (file)
@@ -64,7 +64,7 @@ public:
 
     enum State
     {
-        StopppedState = QSoundSource::StoppedState,
+        StoppedState = QSoundSource::StoppedState,
         PlayingState = QSoundSource::PlayingState,
         PausedState = QSoundSource::PausedState
     };