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/plugins/directshow/camera | |
parent | b690a4d90282d2cae5d7a10739d726594d036dde (diff) |
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/plugins/directshow/camera')
-rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 10 | ||||
-rw-r--r-- | src/plugins/directshow/camera/dsvideowidgetcontrol.cpp | 4 | ||||
-rw-r--r-- | src/plugins/directshow/camera/dsvideowidgetcontrol.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index cc1594feb..6b474e898 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -81,7 +81,7 @@ public: STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) { - if (NULL == ppvObject) + if (NULL == ppvObject) return E_POINTER; if (riid == IID_IUnknown /*__uuidof(IUnknown) */ ) { *ppvObject = static_cast<IUnknown*>(this); @@ -380,9 +380,9 @@ QSize DSCameraSession::frameSize() const void DSCameraSession::setFrameSize(const QSize& s) { - if (supportedResolutions(pixelF).contains(s)) + if (supportedResolutions(pixelF).contains(s)) m_windowSize = s; - else + else qWarning() << "frame size if not supported for current pixel format, no change"; } @@ -465,8 +465,8 @@ void DSCameraSession::setPixelFormat(QVideoFrame::PixelFormat fmt) QList<QSize> DSCameraSession::supportedResolutions(QVideoFrame::PixelFormat format) { - if (!resolutions.contains(format)) - return QList<QSize>(); + if (!resolutions.contains(format)) + return QList<QSize>(); return resolutions.value(format); } diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp index fde9f554e..35b795546 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp @@ -120,7 +120,7 @@ DSVideoWidgetControl::DSVideoWidgetControl(DSCameraSession* session, QObject *pa m_widget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_widget->setAlignment(Qt::AlignCenter); m_widget->setAttribute(Qt::WA_NoSystemBackground, true); - + surface = new DSVideoWidgetSurface(m_widget); QPalette palette; @@ -157,7 +157,7 @@ bool DSVideoWidgetControl::eventFilter(QObject *object, QEvent *e) case QEvent::PolishRequest: m_widget->ensurePolished(); break; - + default: // Do nothing break; diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index ac40fbd7c..2a8775aee 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h @@ -82,15 +82,15 @@ class DSVideoWidgetSurface : public QAbstractVideoSurface class DSVideoWidgetControl : public QVideoWidgetControl { Q_OBJECT - + DSVideoWidgetSurface* surface; public: // Constructor & Destructor - + DSVideoWidgetControl(DSCameraSession* session, QObject *parent = 0); virtual ~DSVideoWidgetControl(); public: // QVideoWidgetControl - + QWidget *videoWidget(); // Aspect Ratio @@ -118,10 +118,10 @@ public: // QVideoWidgetControl void setSaturation(int saturation); public: // Internal - + bool eventFilter(QObject *object, QEvent *event); - -/* + +/* Q_SIGNALS: // QVideoWidgetControl void fullScreenChanged(bool fullScreen); |