diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-02-06 14:58:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 06:32:03 +0100 |
| commit | 0d9a5cc5b39db46701af1a6944c8c6f31e75ae6f (patch) | |
| tree | 6ad5f1cb8f913ef5dca8ae8c916a0f3ba8683190 | |
| parent | 809bbc35c67f085e91db9202795cccab0a5ae548 (diff) | |
| download | qtmultimedia-0d9a5cc5b39db46701af1a6944c8c6f31e75ae6f.tar.gz | |
Fix some warnings.
Change-Id: I2ea7f6f016d34490a41e4c9449cbc92bd040de49
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_qmedia_p.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 695ab6cff..13e7fab88 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -63,8 +63,8 @@ class QAudioDeviceInfoPrivate : public QSharedData { public: QAudioDeviceInfoPrivate() - : info(0), - mode(QAudio::AudioOutput) + : mode(QAudio::AudioOutput) + , info(0) { } @@ -203,6 +203,7 @@ bool QAudioDeviceInfo::operator ==(const QAudioDeviceInfo &other) const && d->handle == other.d->handle && deviceName() == other.deviceName()) return true; + return false; } /*! diff --git a/src/multimedia/audio/qsoundeffect_qmedia_p.cpp b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp index 11de26b04..dd83f60f1 100644 --- a/src/multimedia/audio/qsoundeffect_qmedia_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qmedia_p.cpp @@ -212,6 +212,7 @@ void QSoundEffectPrivate::mediaStatusChanged(QMediaPlayer::MediaStatus status) void QSoundEffectPrivate::error(QMediaPlayer::Error err) { + Q_UNUSED(err); bool playingDirty = false; if (m_playing) { m_playing = false; |