diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-02-14 10:56:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 08:30:40 +0100 |
| commit | 4f38f950b0e4b0637a2a267638496a44456ae456 (patch) | |
| tree | f95905a15a171843ec36e1f9444d7cd8464219f9 /src/multimediawidgets/qpaintervideosurface.cpp | |
| parent | bd9484ddca2780c4b1266849c00b1024e9b1c7cf (diff) | |
Fix some compiler warnings.
As it turns out, we had an overloaded virtual from an earlier era,
with the extra parameter never used. So cleaning that up was a
bonus to remove the compiler warning.
Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface.cpp')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index c0e1c3925..672a103de 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -70,8 +70,7 @@ public: QList<QVideoFrame::PixelFormat> supportedPixelFormats( QAbstractVideoBuffer::HandleType handleType) const; - bool isFormatSupported( - const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const; QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format); void stop(); @@ -117,8 +116,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGenericPainter::supportedPixelForma return QList<QVideoFrame::PixelFormat>(); } -bool QVideoSurfaceGenericPainter::isFormatSupported( - const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const +bool QVideoSurfaceGenericPainter::isFormatSupported(const QVideoSurfaceFormat &format) const { switch (format.handleType()) { case QAbstractVideoBuffer::QPixmapHandle: @@ -246,8 +244,7 @@ public: QList<QVideoFrame::PixelFormat> supportedPixelFormats( QAbstractVideoBuffer::HandleType handleType) const; - bool isFormatSupported( - const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const; + bool isFormatSupported(const QVideoSurfaceFormat &format) const; QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); @@ -327,8 +324,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGLPainter::supportedPixelFormats( return QList<QVideoFrame::PixelFormat>(); } -bool QVideoSurfaceGLPainter::isFormatSupported( - const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const +bool QVideoSurfaceGLPainter::isFormatSupported(const QVideoSurfaceFormat &format) const { if (format.frameSize().isEmpty()) { return false; @@ -1349,13 +1345,12 @@ QList<QVideoFrame::PixelFormat> QPainterVideoSurface::supportedPixelFormats( /*! */ -bool QPainterVideoSurface::isFormatSupported( - const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const +bool QPainterVideoSurface::isFormatSupported(const QVideoSurfaceFormat &format) const { if (!m_painter) const_cast<QPainterVideoSurface *>(this)->createPainter(); - return m_painter->isFormatSupported(format, similar); + return m_painter->isFormatSupported(format); } /*! |