From 6c11e959d47c91d89d7d841e3996d4c241b01955 Mon Sep 17 00:00:00 2001 From: wang-bin Date: Fri, 27 Dec 2013 01:21:30 +0800 Subject: [PATCH] vo.dtor not pure virtual --- qml/QmlAV/QQuickItemRenderer.h | 1 - src/Direct2DRenderer.cpp | 4 ---- src/GDIRenderer.cpp | 4 ---- src/GLWidgetRenderer.cpp | 4 ---- src/GraphicsItemRenderer.cpp | 4 ---- src/QPainterRenderer.cpp | 4 ---- src/QtAV/Direct2DRenderer.h | 1 - src/QtAV/GDIRenderer.h | 1 - src/QtAV/GLWidgetRenderer.h | 1 - src/QtAV/GraphicsItemRenderer.h | 1 - src/QtAV/QPainterRenderer.h | 1 - src/QtAV/VideoRenderer.h | 2 +- src/QtAV/WidgetRenderer.h | 1 - src/QtAV/XVRenderer.h | 1 - src/WidgetRenderer.cpp | 4 ---- src/XVRenderer.cpp | 4 ---- 16 files changed, 1 insertion(+), 37 deletions(-) diff --git a/qml/QmlAV/QQuickItemRenderer.h b/qml/QmlAV/QQuickItemRenderer.h index 99ca9e67d..ec77dec41 100644 --- a/qml/QmlAV/QQuickItemRenderer.h +++ b/qml/QmlAV/QQuickItemRenderer.h @@ -48,7 +48,6 @@ class QMLAV_EXPORT QQuickItemRenderer : public QQuickItem, public VideoRenderer }; explicit QQuickItemRenderer(QQuickItem *parent = 0); - ~QQuickItemRenderer() {} virtual VideoRendererId id() const; virtual bool receiveFrame(const VideoFrame &frame); diff --git a/src/Direct2DRenderer.cpp b/src/Direct2DRenderer.cpp index 40c0ab402..2dd6150c7 100644 --- a/src/Direct2DRenderer.cpp +++ b/src/Direct2DRenderer.cpp @@ -43,10 +43,6 @@ Direct2DRenderer::Direct2DRenderer(QWidget *parent, Qt::WindowFlags f): setAttribute(Qt::WA_PaintOnScreen, true); } -Direct2DRenderer::~Direct2DRenderer() -{ -} - bool Direct2DRenderer::receiveFrame(const VideoFrame& frame) { DPTR_D(Direct2DRenderer); diff --git a/src/GDIRenderer.cpp b/src/GDIRenderer.cpp index 6bdc9aded..ae61752b9 100644 --- a/src/GDIRenderer.cpp +++ b/src/GDIRenderer.cpp @@ -48,10 +48,6 @@ GDIRenderer::GDIRenderer(QWidget *parent, Qt::WindowFlags f): setAttribute(Qt::WA_PaintOnScreen, true); } -GDIRenderer::~GDIRenderer() -{ -} - QPaintEngine* GDIRenderer::paintEngine() const { return 0; diff --git a/src/GLWidgetRenderer.cpp b/src/GLWidgetRenderer.cpp index c5df6c2ab..951b2c73c 100644 --- a/src/GLWidgetRenderer.cpp +++ b/src/GLWidgetRenderer.cpp @@ -171,10 +171,6 @@ GLWidgetRenderer::GLWidgetRenderer(QWidget *parent, const QGLWidget* shareWidget setOSDFilter(new OSDFilterQPainter()); } -GLWidgetRenderer::~GLWidgetRenderer() -{ -} - bool GLWidgetRenderer::receiveFrame(const VideoFrame& frame) { DPTR_D(GLWidgetRenderer); diff --git a/src/GraphicsItemRenderer.cpp b/src/GraphicsItemRenderer.cpp index 78e5c356e..a458feb45 100644 --- a/src/GraphicsItemRenderer.cpp +++ b/src/GraphicsItemRenderer.cpp @@ -52,10 +52,6 @@ GraphicsItemRenderer::GraphicsItemRenderer(GraphicsItemRendererPrivate &d, QGrap #endif //CONFIG_GRAPHICSWIDGET } -GraphicsItemRenderer::~GraphicsItemRenderer() -{ -} - bool GraphicsItemRenderer::receiveFrame(const VideoFrame& frame) { prepareFrame(frame); diff --git a/src/QPainterRenderer.cpp b/src/QPainterRenderer.cpp index c5efccf57..fcb803419 100644 --- a/src/QPainterRenderer.cpp +++ b/src/QPainterRenderer.cpp @@ -41,10 +41,6 @@ QPainterRenderer::QPainterRenderer(QPainterRendererPrivate &d) setOSDFilter(new OSDFilterQPainter()); } -QPainterRenderer::~QPainterRenderer() -{ -} - int QPainterRenderer::filterContextType() const { return FilterContext::QtPainter; diff --git a/src/QtAV/Direct2DRenderer.h b/src/QtAV/Direct2DRenderer.h index 80ae08ed9..4cd155f1f 100644 --- a/src/QtAV/Direct2DRenderer.h +++ b/src/QtAV/Direct2DRenderer.h @@ -38,7 +38,6 @@ class Q_AV_EXPORT Direct2DRenderer : public QWidget, public VideoRenderer DPTR_DECLARE_PRIVATE(Direct2DRenderer) public: Direct2DRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0); - virtual ~Direct2DRenderer(); virtual VideoRendererId id() const; /* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require diff --git a/src/QtAV/GDIRenderer.h b/src/QtAV/GDIRenderer.h index a88a54902..8f0c47971 100644 --- a/src/QtAV/GDIRenderer.h +++ b/src/QtAV/GDIRenderer.h @@ -34,7 +34,6 @@ class Q_AV_EXPORT GDIRenderer : public QWidget, public VideoRenderer DPTR_DECLARE_PRIVATE(GDIRenderer) public: GDIRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0); //offscreen? - virtual ~GDIRenderer(); virtual VideoRendererId id() const; /* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require * native painting primitives, you need to reimplement QWidget::paintEngine() to diff --git a/src/QtAV/GLWidgetRenderer.h b/src/QtAV/GLWidgetRenderer.h index ede7e74c2..3ce02d9e5 100644 --- a/src/QtAV/GLWidgetRenderer.h +++ b/src/QtAV/GLWidgetRenderer.h @@ -34,7 +34,6 @@ class Q_AV_EXPORT GLWidgetRenderer : public QGLWidget, public VideoRenderer DPTR_DECLARE_PRIVATE(GLWidgetRenderer) public: GLWidgetRenderer(QWidget* parent = 0, const QGLWidget* shareWidget = 0, Qt::WindowFlags f = 0); - virtual ~GLWidgetRenderer(); virtual VideoRendererId id() const; protected: diff --git a/src/QtAV/GraphicsItemRenderer.h b/src/QtAV/GraphicsItemRenderer.h index 574843364..a5f4013da 100644 --- a/src/QtAV/GraphicsItemRenderer.h +++ b/src/QtAV/GraphicsItemRenderer.h @@ -41,7 +41,6 @@ class Q_AV_EXPORT GraphicsItemRenderer : public GraphicsWidget, public QPainterR DPTR_DECLARE_PRIVATE(GraphicsItemRenderer) public: GraphicsItemRenderer(QGraphicsItem * parent = 0); - virtual ~GraphicsItemRenderer(); virtual VideoRendererId id() const; QRectF boundingRect() const; diff --git a/src/QtAV/QPainterRenderer.h b/src/QtAV/QPainterRenderer.h index 4cce59666..654062930 100644 --- a/src/QtAV/QPainterRenderer.h +++ b/src/QtAV/QPainterRenderer.h @@ -33,7 +33,6 @@ class Q_AV_EXPORT QPainterRenderer : public VideoRenderer DPTR_DECLARE_PRIVATE(QPainterRenderer) public: QPainterRenderer(); - virtual ~QPainterRenderer(); virtual VideoRendererId id () const; virtual int filterContextType() const; //virtual QImage currentFrameImage() const; diff --git a/src/QtAV/VideoRenderer.h b/src/QtAV/VideoRenderer.h index f3487c881..c5d3d202e 100644 --- a/src/QtAV/VideoRenderer.h +++ b/src/QtAV/VideoRenderer.h @@ -76,7 +76,7 @@ class Q_AV_EXPORT VideoRenderer : public AVOutput }; VideoRenderer(); - virtual ~VideoRenderer() = 0; + virtual ~VideoRenderer(); virtual VideoRendererId id() const = 0; bool receive(const VideoFrame& frame); diff --git a/src/QtAV/WidgetRenderer.h b/src/QtAV/WidgetRenderer.h index cd6191f8f..d5b382856 100644 --- a/src/QtAV/WidgetRenderer.h +++ b/src/QtAV/WidgetRenderer.h @@ -34,7 +34,6 @@ class Q_AV_EXPORT WidgetRenderer : public QWidget, public QPainterRenderer DPTR_DECLARE_PRIVATE(WidgetRenderer) public: explicit WidgetRenderer(QWidget *parent = 0, Qt::WindowFlags f = 0); - virtual ~WidgetRenderer(); virtual VideoRendererId id() const; signals: void imageReady(); diff --git a/src/QtAV/XVRenderer.h b/src/QtAV/XVRenderer.h index 2df64ac29..edbfb8e6e 100644 --- a/src/QtAV/XVRenderer.h +++ b/src/QtAV/XVRenderer.h @@ -34,7 +34,6 @@ class Q_AV_EXPORT XVRenderer : public QWidget, public VideoRenderer DPTR_DECLARE_PRIVATE(XVRenderer) public: XVRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0); - virtual ~XVRenderer(); virtual VideoRendererId id() const; /* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require diff --git a/src/WidgetRenderer.cpp b/src/WidgetRenderer.cpp index 15d0a8752..46791e40d 100644 --- a/src/WidgetRenderer.cpp +++ b/src/WidgetRenderer.cpp @@ -69,10 +69,6 @@ WidgetRenderer::WidgetRenderer(WidgetRendererPrivate &d, QWidget *parent, Qt::Wi connect(this, SIGNAL(imageReady()), SLOT(update())); } -WidgetRenderer::~WidgetRenderer() -{ -} - bool WidgetRenderer::receiveFrame(const VideoFrame &frame) { prepareFrame(frame); diff --git a/src/XVRenderer.cpp b/src/XVRenderer.cpp index 44f134a6c..7edc90e59 100644 --- a/src/XVRenderer.cpp +++ b/src/XVRenderer.cpp @@ -46,10 +46,6 @@ XVRenderer::XVRenderer(QWidget *parent, Qt::WindowFlags f): setAttribute(Qt::WA_PaintOnScreen, true); } -XVRenderer::~XVRenderer() -{ -} - bool XVRenderer::receiveFrame(const VideoFrame& frame) { DPTR_D(XVRenderer);