diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-25 13:45:06 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 20:21:02 +0200 |
| commit | 7a4ea3035087d6eafe96f8ec304bef95b3a74ea0 (patch) | |
| tree | d86427ec3956d3adff6814a058fbc0cf070e1582 /src | |
| parent | 8960e47c24d2e9bb03c0911c59e75f29ed210285 (diff) | |
Fix warnings in qtmultimedia
/camerabinresourcepolicy.cpp:100:42: error: unused variable 'oldSet' [-Werror=unused-variable]
camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized]
qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable]
Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp index 202f7a223..620060648 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp @@ -149,7 +149,7 @@ void CameraBinControl::setState(QCamera::State state) return; } - CamerabinResourcePolicy::ResourceSet resourceSet; + CamerabinResourcePolicy::ResourceSet resourceSet = CamerabinResourcePolicy::NoResources; switch (state) { case QCamera::UnloadedState: resourceSet = CamerabinResourcePolicy::NoResources; diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp index 71f2d5170..11b04a974 100644 --- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp @@ -162,6 +162,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe m_resource->release(); } } +#else + Q_UNUSED(oldSet); #endif } diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 5dbfa3e46..cd3265819 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -415,6 +415,7 @@ void QPulseAudioOutput::userFeed() } qint64 bytesWritten = write(m_audioBuffer, audioBytesPulled); Q_ASSERT(bytesWritten == audioBytesPulled); //unfinished write should not happen since the data provided is less than writableSize + Q_UNUSED(bytesWritten); if (chunks > 1) { // PulseAudio needs more data. Ask for it immediately. |