summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-03-25 00:32:03 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-03-25 00:39:43 (GMT)
commit444e8812eec42abd2dcc5e47826f9a4793a34f66 (patch)
tree1b42fbae90ae91e77d06e0ab9f6934363594b9d9 /src/multimedia
parente15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff)
downloadQt-444e8812eec42abd2dcc5e47826f9a4793a34f66.zip
Qt-444e8812eec42abd2dcc5e47826f9a4793a34f66.tar.gz
Qt-444e8812eec42abd2dcc5e47826f9a4793a34f66.tar.bz2
Rename loopCount to loops, in line with other declarative elements.
Reviewed-by: Dmytro Poplavskiy
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/effects/qsoundeffect.cpp10
-rw-r--r--src/multimedia/effects/qsoundeffect_p.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index 53cad8e..ed9ab3f 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlproperty int SoundEffect::loopCount
+ \qmlproperty int SoundEffect::loops
This property provides a way to control the number of times to repeat the sound on each play().
*/
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlsignal SoundEffect::loopCountChanged()
+ \qmlsignal SoundEffect::loopsChanged()
This handler is called when the number of loops has changes.
*/
@@ -150,18 +150,18 @@ void QSoundEffect::setSource(const QUrl &url)
emit sourceChanged();
}
-int QSoundEffect::loopCount() const
+int QSoundEffect::loops() const
{
return d->loopCount();
}
-void QSoundEffect::setLoopCount(int loopCount)
+void QSoundEffect::setLoops(int loopCount)
{
if (d->loopCount() == loopCount)
return;
d->setLoopCount(loopCount);
- emit loopCountChanged();
+ emit loopsChanged();
}
int QSoundEffect::volume() const
diff --git a/src/multimedia/effects/qsoundeffect_p.h b/src/multimedia/effects/qsoundeffect_p.h
index ec6a2f7..05207a0 100644
--- a/src/multimedia/effects/qsoundeffect_p.h
+++ b/src/multimedia/effects/qsoundeffect_p.h
@@ -67,7 +67,7 @@ class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
- Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount NOTIFY loopCountChanged)
+ Q_PROPERTY(int loops READ loops WRITE setLoops NOTIFY loopsChanged)
Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
@@ -78,8 +78,8 @@ public:
QUrl source() const;
void setSource(const QUrl &url);
- int loopCount() const;
- void setLoopCount(int loopCount);
+ int loops() const;
+ void setLoops(int loopCount);
int volume() const;
void setVolume(int volume);
@@ -89,7 +89,7 @@ public:
Q_SIGNALS:
void sourceChanged();
- void loopCountChanged();
+ void loopsChanged();
void volumeChanged();
void mutedChanged();