summaryrefslogtreecommitdiffstats
path: root/src/plugins/qt7
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qt7')
-rw-r--r--src/plugins/qt7/mediaplayer/qt7playercontrol.mm2
-rw-r--r--src/plugins/qt7/qcvdisplaylink.h2
-rw-r--r--src/plugins/qt7/qt7movierenderer.h4
-rw-r--r--src/plugins/qt7/qt7movievideowidget.h4
-rw-r--r--src/plugins/qt7/qt7movievideowidget.mm14
-rw-r--r--src/plugins/qt7/qt7movieviewoutput.h2
-rw-r--r--src/plugins/qt7/qt7movieviewoutput.mm2
-rw-r--r--src/plugins/qt7/qt7movieviewrenderer.mm2
-rw-r--r--src/plugins/qt7/qt7videooutput.mm4
9 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/qt7/mediaplayer/qt7playercontrol.mm b/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
index c987f6952..c48660778 100644
--- a/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playercontrol.mm
@@ -51,7 +51,7 @@ QT_USE_NAMESPACE
QT7PlayerControl::QT7PlayerControl(QObject *parent)
: QMediaPlayerControl(parent)
-{
+{
}
QT7PlayerControl::~QT7PlayerControl()
diff --git a/src/plugins/qt7/qcvdisplaylink.h b/src/plugins/qt7/qcvdisplaylink.h
index 2d4809c49..f59cc92bf 100644
--- a/src/plugins/qt7/qcvdisplaylink.h
+++ b/src/plugins/qt7/qcvdisplaylink.h
@@ -73,7 +73,7 @@ public:
protected:
virtual bool event(QEvent *);
-
+
private:
CVDisplayLinkRef m_displayLink;
QMutex m_displayLinkMutex;
diff --git a/src/plugins/qt7/qt7movierenderer.h b/src/plugins/qt7/qt7movierenderer.h
index aed39ad9a..bdc7c5260 100644
--- a/src/plugins/qt7/qt7movierenderer.h
+++ b/src/plugins/qt7/qt7movierenderer.h
@@ -80,7 +80,7 @@ public:
private Q_SLOTS:
void updateVideoFrame(const CVTimeStamp &ts);
-
+
private:
void setupVideoOutput();
bool createPixelBufferVisualContext();
@@ -92,7 +92,7 @@ private:
QCvDisplayLink *m_displayLink;
#ifdef QUICKTIME_C_API_AVAILABLE
- QTVisualContextRef m_visualContext;
+ QTVisualContextRef m_visualContext;
bool m_usingGLContext;
const QGLContext *m_currentGLContext;
QSize m_pixelBufferContextGeometry;
diff --git a/src/plugins/qt7/qt7movievideowidget.h b/src/plugins/qt7/qt7movievideowidget.h
index fd0c3d075..cd61869fa 100644
--- a/src/plugins/qt7/qt7movievideowidget.h
+++ b/src/plugins/qt7/qt7movievideowidget.h
@@ -95,7 +95,7 @@ public:
private Q_SLOTS:
void updateVideoFrame(const CVTimeStamp &ts);
-
+
private:
void setupVideoOutput();
bool createVisualContext();
@@ -108,7 +108,7 @@ private:
QCvDisplayLink *m_displayLink;
#ifdef QUICKTIME_C_API_AVAILABLE
- QTVisualContextRef m_visualContext;
+ QTVisualContextRef m_visualContext;
#endif
bool m_fullscreen;
diff --git a/src/plugins/qt7/qt7movievideowidget.mm b/src/plugins/qt7/qt7movievideowidget.mm
index 11f2ad32c..ec9367bcc 100644
--- a/src/plugins/qt7/qt7movievideowidget.mm
+++ b/src/plugins/qt7/qt7movievideowidget.mm
@@ -76,7 +76,7 @@ public:
m_nativeSize(640,480),
m_aspectRatioMode(Qt::KeepAspectRatio)
{
- setAutoFillBackground(false);
+ setAutoFillBackground(false);
}
void initializeGL()
@@ -151,7 +151,7 @@ public:
void setNativeSize(const QSize &size)
{
- m_nativeSize = size;
+ m_nativeSize = size;
}
void setAspectRatioMode(Qt::AspectRatioMode mode)
@@ -184,8 +184,8 @@ private:
QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent)
:QT7VideoWidgetControl(parent),
- m_movie(0),
- m_videoWidget(0),
+ m_movie(0),
+ m_videoWidget(0),
m_fullscreen(false),
m_aspectRatioMode(Qt::KeepAspectRatio),
m_brightness(0),
@@ -325,7 +325,7 @@ bool QT7MovieVideoWidget::isFullScreen() const
void QT7MovieVideoWidget::setFullScreen(bool fullScreen)
{
- m_fullscreen = fullScreen;
+ m_fullscreen = fullScreen;
}
QSize QT7MovieVideoWidget::nativeSize() const
@@ -341,7 +341,7 @@ Qt::AspectRatioMode QT7MovieVideoWidget::aspectRatioMode() const
void QT7MovieVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode)
{
m_aspectRatioMode = mode;
- m_videoWidget->setAspectRatioMode(mode);
+ m_videoWidget->setAspectRatioMode(mode);
}
int QT7MovieVideoWidget::brightness() const
@@ -410,7 +410,7 @@ void QT7MovieVideoWidget::updateColors()
void QT7MovieVideoWidget::updateVideoFrame(const CVTimeStamp &ts)
{
#ifdef QUICKTIME_C_API_AVAILABLE
- AutoReleasePool pool;
+ AutoReleasePool pool;
// check for new frame
if (m_visualContext && QTVisualContextIsNewImageAvailable(m_visualContext, &ts)) {
CVOpenGLTextureRef currentFrame = NULL;
diff --git a/src/plugins/qt7/qt7movieviewoutput.h b/src/plugins/qt7/qt7movieviewoutput.h
index ea3d248f8..2e3ed2c7c 100644
--- a/src/plugins/qt7/qt7movieviewoutput.h
+++ b/src/plugins/qt7/qt7movieviewoutput.h
@@ -91,7 +91,7 @@ public:
int saturation() const;
void setSaturation(int saturation);
-
+
private:
void setupVideoOutput();
diff --git a/src/plugins/qt7/qt7movieviewoutput.mm b/src/plugins/qt7/qt7movieviewoutput.mm
index c6a2bbafe..4fcf01d39 100644
--- a/src/plugins/qt7/qt7movieviewoutput.mm
+++ b/src/plugins/qt7/qt7movieviewoutput.mm
@@ -166,7 +166,7 @@ QT7MovieViewOutput::QT7MovieViewOutput(QObject *parent)
m_contrast(0),
m_hue(0),
m_saturation(0)
-{
+{
}
QT7MovieViewOutput::~QT7MovieViewOutput()
diff --git a/src/plugins/qt7/qt7movieviewrenderer.mm b/src/plugins/qt7/qt7movieviewrenderer.mm
index 0e1571f92..a59031577 100644
--- a/src/plugins/qt7/qt7movieviewrenderer.mm
+++ b/src/plugins/qt7/qt7movieviewrenderer.mm
@@ -278,7 +278,7 @@ QT7MovieViewRenderer::QT7MovieViewRenderer(QObject *parent)
m_fbo(0),
m_ciContext(0),
m_pendingRenderEvent(false)
-{
+{
}
QT7MovieViewRenderer::~QT7MovieViewRenderer()
diff --git a/src/plugins/qt7/qt7videooutput.mm b/src/plugins/qt7/qt7videooutput.mm
index 6c657c279..53486c4e4 100644
--- a/src/plugins/qt7/qt7videooutput.mm
+++ b/src/plugins/qt7/qt7videooutput.mm
@@ -47,10 +47,10 @@ QT_USE_NAMESPACE
/*
QT7VideoOutputControl::QT7VideoOutputControl(QObject *parent)
- :QVideoOutputControl(parent),
+ :QVideoOutputControl(parent),
m_session(0),
m_output(QVideoOutputControl::NoOutput)
-{
+{
}
QT7VideoOutputControl::~QT7VideoOutputControl()