diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 19:27:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-30 14:32:10 +0100 |
commit | 5980bc41cf55073e63236467466a59577d406937 (patch) | |
tree | 9be7ed8c7adc8ec4fbe8b860feebd7961ac453d0 /src/multimediawidgets | |
parent | b690a4d90282d2cae5d7a10739d726594d036dde (diff) | |
download | qtmultimedia-5980bc41cf55073e63236467466a59577d406937.tar.gz |
whitespace fixes
remove trailing spaces & expand tabs.
Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.h | 4 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget_p.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 6db81a55b..24128d2e6 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -68,7 +68,7 @@ public: QGraphicsVideoItem(QGraphicsItem *parent = 0); ~QGraphicsVideoItem(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const; Qt::AspectRatioMode aspectRatioMode() const; void setAspectRatioMode(Qt::AspectRatioMode mode); diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 30ebbded4..87757914f 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -841,7 +841,7 @@ QAbstractVideoSurface::Error QVideoSurfaceArbFpPainter::paint( painter->fillRect(target, Qt::black); return QAbstractVideoSurface::NoError; } - + const QAbstractVideoBuffer::HandleType h = m_frame.handleType(); if (h == QAbstractVideoBuffer::NoHandle || h == QAbstractVideoBuffer::GLTextureHandle) { bool stencilTestEnabled = glIsEnabled(GL_STENCIL_TEST); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index ec71bb6c7..77e9d75da 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -67,9 +67,9 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin public: QVideoWidget(QWidget *parent = 0); - ~QVideoWidget(); + ~QVideoWidget(); - QMediaObject *mediaObject() const; + QMediaObject *mediaObject() const; #ifdef Q_QDOC bool isFullScreen() const; diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index a7412202f..b60235991 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -230,7 +230,7 @@ public: QVideoWidgetPrivate() : q_ptr(0) , mediaObject(0) - , service(0) + , service(0) , widgetBackend(0) , windowBackend(0) , rendererBackend(0) |