From d502dec45604ba77d997061bc7f4f6f688c42f9f Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Mon, 27 Jun 2011 12:00:33 +1000 Subject: [PATCH] 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 Reviewed-by: Michael Goddard --- src/multimediakit/qcameraviewfinder.cpp | 2 -- src/multimediakit/video/qvideosurfaceformat.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/multimediakit/qcameraviewfinder.cpp b/src/multimediakit/qcameraviewfinder.cpp index dc779c6..8613616 100644 --- 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 --- 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())); } -- 2.7.4