summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Cummings <angus.cummings@nokia.com>2012-06-07 11:01:28 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-13 05:53:47 +0200
commit80f37d2d80f16fd653c3e8076acf2865eae028d3 (patch)
treed9dbf8aa99357efd8d100c8e5f96fe1fd5b69a43
parent931c2d3ffe88086e1839ee5b8b8ddcab06fd698d (diff)
Renaming StopppedState to StoppedState
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
-rw-r--r--src/imports/audioengine/qdeclarative_audioengine_p.cpp2
-rw-r--r--src/imports/audioengine/qdeclarative_soundinstance_p.cpp4
-rw-r--r--src/imports/audioengine/qdeclarative_soundinstance_p.h2
-rw-r--r--src/imports/audioengine/qsoundinstance_p.cpp10
-rw-r--r--src/imports/audioengine/qsoundinstance_p.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index fa7c1919c..1a75e8349 100644
--- 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 b5763df14..c29968f55 100644
--- 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 0fd8c9a20..d91573262 100644
--- 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 9c5fc7ad9..a2effd9b0 100644
--- 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 627862728..b3309c569 100644
--- 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
};