Two minor static analysis issues.

Reviewed-by: Jonas Rabbe
(cherry picked from commit f8d04d717d3d7d5d2f73cc3e8a4245130fcf600a)

Change-Id: I3b12fd3a42d16730df3fe1277ba6821b5c2ef960
Reviewed-on: http://codereview.qt.nokia.com/982
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard

diff --git a/src/multimediakit/qcameraviewfinder.cpp b/src/multimediakit/qcameraviewfinder.cpp
index dc779c6..8613616 100644 (file)
--- a/src/multimediakit/qcameraviewfinder.cpp
+++ b/src/multimediakit/qcameraviewfinder.cpp
@@ -107,8 +107,6 @@ QMediaObject *QCameraViewfinder::mediaObject() const
 */
 bool QCameraViewfinder::setMediaObject(QMediaObject *object)
 {
-    Q_D(QCameraViewfinder);
-
     return QVideoWidget::setMediaObject(object);
 }
 

diff --git a/src/multimediakit/video/qvideosurfaceformat.cpp b/src/multimediakit/video/qvideosurfaceformat.cpp
index 58b2baa..c384093 100644 (file)
--- a/src/multimediakit/video/qvideosurfaceformat.cpp
+++ b/src/multimediakit/video/qvideosurfaceformat.cpp
@@ -689,6 +689,7 @@ QDebug operator<<(QDebug dbg, const QVideoSurfaceFormat &f)
         break;
     case QVideoFrame::Format_Y16:
         typeName = QLatin1String("Format_Y16");
+        break;
     default:
         typeName = QString(QLatin1String("UserType(%1)" )).arg(int(f.pixelFormat()));
     }