diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-01-14 12:11:09 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-25 16:33:50 +0100 |
commit | 52ad3219f073b87cfc1c57ced77266e3e7fad7ee (patch) | |
tree | bb98e94c12be777521c1af7f4c82d5cd4e4e53a8 /examples/multimedia/audiooutput | |
parent | 101c78983a8acd6cc7a7cb314700fabd6e8909dc (diff) | |
download | qtmultimedia-52ad3219f073b87cfc1c57ced77266e3e7fad7ee.tar.gz |
QAudioInput/Output documentation: Fix slot naming in snippets
Having a code snippet use a slot (stateChanged) with a name
identical to a signal in QAudioInput / QAudioOutput classes causes
problems (incorrect links) in class documentation that refer to
the snippet code.
This change renames the slots according to standard Qt convention.
Same change is applied to example applications as well.
Task-number: QTBUG-26688
Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/multimedia/audiooutput')
-rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 4 | ||||
-rw-r--r-- | examples/multimedia/audiooutput/audiooutput.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index f361dd021..847f72dff 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -241,7 +241,7 @@ void AudioTest::createAudioOutput() m_audioOutput = 0; m_audioOutput = new QAudioOutput(m_device, m_format, this); connect(m_audioOutput, SIGNAL(notify()), SLOT(notified())); - connect(m_audioOutput, SIGNAL(stateChanged(QAudio::State)), SLOT(stateChanged(QAudio::State))); + connect(m_audioOutput, SIGNAL(stateChanged(QAudio::State)), SLOT(handleStateChanged(QAudio::State))); m_generator->start(); m_audioOutput->start(m_generator); m_volumeSlider->setValue(int(m_audioOutput->volume()*100.0f)); @@ -328,7 +328,7 @@ void AudioTest::toggleSuspendResume() } } -void AudioTest::stateChanged(QAudio::State state) +void AudioTest::handleStateChanged(QAudio::State state) { qWarning() << "state = " << state; } diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 3ca6a0d1a..30cf35369 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -114,7 +114,7 @@ private slots: void pullTimerExpired(); void toggleMode(); void toggleSuspendResume(); - void stateChanged(QAudio::State state); + void handleStateChanged(QAudio::State state); void deviceChanged(int index); void volumeChanged(int); }; |