slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some compiler warnings.

Browse Source 
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>
This commit is contained in:
Michael Goddard
2012-02-14 10:56:04 +10:00
committed by Qt by Nokia
parent bd9484ddca
commit 4f38f950b0
13 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/multimediawidgets/qpaintervideosurface.cpp
View File

@@ -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);
}
/*!