summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 19:27:51 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-30 14:32:10 +0100
commit5980bc41cf55073e63236467466a59577d406937 (patch)
tree9be7ed8c7adc8ec4fbe8b860feebd7961ac453d0 /src
parentb690a4d90282d2cae5d7a10739d726594d036dde (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')
-rw-r--r--src/gsttools/qgstreamervideowidget.cpp2
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp4
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp24
-rw-r--r--src/multimedia/audio/qaudioinput_win32_p.cpp12
-rw-r--r--src/multimedia/audio/qaudiooutput_alsa_p.cpp4
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.cpp32
-rw-r--r--src/multimedia/controls/qcameraflashcontrol.h2
-rw-r--r--src/multimedia/controls/qcameralockscontrol.h2
-rw-r--r--src/multimedia/controls/qimageencodercontrol.h2
-rw-r--r--src/multimedia/doc/src/classic.css50
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h4
-rw-r--r--src/multimedia/playback/qmediaplayer.h2
-rw-r--r--src/multimediawidgets/qgraphicsvideoitem.h2
-rw-r--r--src/multimediawidgets/qpaintervideosurface.cpp2
-rw-r--r--src/multimediawidgets/qvideowidget.h4
-rw-r--r--src/multimediawidgets/qvideowidget_p.h2
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp10
-rw-r--r--src/plugins/directshow/camera/dsvideowidgetcontrol.cpp4
-rw-r--r--src/plugins/directshow/camera/dsvideowidgetcontrol.h12
-rw-r--r--src/plugins/directshow/player/directshoweventloop.cpp2
-rw-r--r--src/plugins/directshow/player/directshowglobal.h10
-rw-r--r--src/plugins/directshow/player/directshowioreader.cpp2
-rw-r--r--src/plugins/directshow/player/directshowiosource.cpp6
-rw-r--r--src/plugins/directshow/player/directshowmetadatacontrol.cpp2
-rw-r--r--src/plugins/directshow/player/directshowplayercontrol.h4
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp8
-rw-r--r--src/plugins/directshow/player/directshowsamplescheduler.cpp6
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.cpp2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinflash.h2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinsession.h2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabuttonlistener_meego.cpp2
-rw-r--r--src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp4
-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
41 files changed, 132 insertions, 132 deletions
diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp
index cf3bc1afe..8297040c1 100644
--- a/src/gsttools/qgstreamervideowidget.cpp
+++ b/src/gsttools/qgstreamervideowidget.cpp
@@ -100,7 +100,7 @@ QGstreamerVideoWidgetControl::QGstreamerVideoWidgetControl(QObject *parent)
, m_videoSink(0)
, m_widget(0)
, m_fullScreen(false)
-{
+{
}
QGstreamerVideoWidgetControl::~QGstreamerVideoWidgetControl()
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index d2a4eea3a..bc992029a 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -166,11 +166,11 @@ bool QAudioDeviceInfoInternal::open()
QString shortName = device.mid(device.indexOf(QLatin1String("="),0)+1);
- while(snd_card_get_name(idx,&name) == 0) {
+ while (snd_card_get_name(idx,&name) == 0) {
if(dev.contains(QLatin1String(name)))
break;
idx++;
- }
+ }
dev = QString(QLatin1String("hw:%1,0")).arg(idx);
#endif
}
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index e9503d4c3..548a0e9eb 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -344,7 +344,7 @@ void QAudioDeviceInfoInternal::updateLists()
|| (fmt & WAVE_FORMAT_96S08)
) {
sizez.append(8);
- }
+ }
if ((fmt & WAVE_FORMAT_1M16)
|| (fmt & WAVE_FORMAT_1S16)
|| (fmt & WAVE_FORMAT_2M16)
@@ -357,51 +357,51 @@ void QAudioDeviceInfoInternal::updateLists()
|| (fmt & WAVE_FORMAT_96S16)
) {
sizez.append(16);
- }
+ }
if ((fmt & WAVE_FORMAT_1M08)
|| (fmt & WAVE_FORMAT_1S08)
|| (fmt & WAVE_FORMAT_1M16)
|| (fmt & WAVE_FORMAT_1S16)) {
sampleRatez.append(11025);
- }
+ }
if ((fmt & WAVE_FORMAT_2M08)
|| (fmt & WAVE_FORMAT_2S08)
|| (fmt & WAVE_FORMAT_2M16)
|| (fmt & WAVE_FORMAT_2S16)) {
sampleRatez.append(22050);
- }
+ }
if ((fmt & WAVE_FORMAT_4M08)
|| (fmt & WAVE_FORMAT_4S08)
|| (fmt & WAVE_FORMAT_4M16)
|| (fmt & WAVE_FORMAT_4S16)) {
sampleRatez.append(44100);
- }
+ }
if ((fmt & WAVE_FORMAT_48M08)
|| (fmt & WAVE_FORMAT_48S08)
|| (fmt & WAVE_FORMAT_48M16)
|| (fmt & WAVE_FORMAT_48S16)) {
sampleRatez.append(48000);
- }
+ }
if ((fmt & WAVE_FORMAT_96M08)
|| (fmt & WAVE_FORMAT_96S08)
|| (fmt & WAVE_FORMAT_96M16)
|| (fmt & WAVE_FORMAT_96S16)) {
sampleRatez.append(96000);
}
- channelz.append(1);
- channelz.append(2);
+ channelz.append(1);
+ channelz.append(2);
if (mode == QAudio::AudioOutput) {
channelz.append(4);
channelz.append(6);
channelz.append(8);
}
- byteOrderz.append(QAudioFormat::LittleEndian);
+ byteOrderz.append(QAudioFormat::LittleEndian);
- typez.append(QAudioFormat::SignedInt);
- typez.append(QAudioFormat::UnSignedInt);
+ typez.append(QAudioFormat::SignedInt);
+ typez.append(QAudioFormat::UnSignedInt);
- codecz.append(QLatin1String("audio/pcm"));
+ codecz.append(QLatin1String("audio/pcm"));
}
if (sampleRatez.count() > 0)
sampleRatez.prepend(8000);
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 6db34adf3..47818f285 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -505,7 +505,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
deviceState = QAudio::ActiveState;
emit stateChanged(deviceState);
}
- resuming = false;
+ resuming = false;
}
} else {
l = qMin<qint64>(len, waveBlocks[header].dwBytesRecorded - waveBlockOffset);
@@ -523,7 +523,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
deviceState = QAudio::ActiveState;
emit stateChanged(deviceState);
}
- resuming = false;
+ resuming = false;
}
} else {
//no data, not ready yet, next time
@@ -583,7 +583,7 @@ qint64 QAudioInputPrivate::read(char* data, qint64 len)
mutex.unlock();
}
- written+=l;
+ written+=l;
}
#ifdef DEBUG_AUDIO
qDebug()<<"read in len="<<written;
@@ -611,7 +611,7 @@ void QAudioInputPrivate::resume()
mutex.unlock();
header = 0;
- resuming = true;
+ resuming = true;
waveBlockOffset = 0;
waveInStart(hWaveIn);
QTimer::singleShot(20,this,SLOT(feedback()));
@@ -689,8 +689,8 @@ bool QAudioInputPrivate::deviceReady()
read(0, buffer_size);
} else {
// emits readyRead() so user will call read() on QIODevice to get some audio data
- InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
- a->trigger();
+ InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
+ a->trigger();
}
if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 3a779f322..c1eeaec4f 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -343,11 +343,11 @@ bool QAudioOutputPrivate::open()
QString shortName = QLatin1String(m_device.mid(m_device.indexOf('=',0)+1).constData());
- while(snd_card_get_name(idx,&name) == 0) {
+ while (snd_card_get_name(idx,&name) == 0) {
if(qstrncmp(shortName.toLocal8Bit().constData(),name,shortName.length()) == 0)
break;
idx++;
- }
+ }
dev = QString(QLatin1String("hw:%1,0")).arg(idx);
#endif
}
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 286cecba7..dbc46fb80 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -153,7 +153,7 @@ void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
case WOM_DONE:
if(qAudio->finished || qAudio->buffer_size == 0 || qAudio->period_size == 0) {
return;
- }
+ }
qAudio->waveFreeBlockCount++;
if(qAudio->waveFreeBlockCount >= qAudio->buffer_size/qAudio->period_size)
qAudio->waveFreeBlockCount = qAudio->buffer_size/qAudio->period_size;
@@ -590,28 +590,28 @@ bool QAudioOutputPrivate::deviceReady()
#endif
bool startup = false;
if(totalTimeValue == 0)
- startup = true;
+ startup = true;
- bool full=false;
+ bool full=false;
mutex.lock();
- if(waveFreeBlockCount==0) full = true;
+ if (waveFreeBlockCount==0) full = true;
mutex.unlock();
- if (full){
+ if (full) {
#ifdef DEBUG_AUDIO
qDebug() << "Skipping data as unable to write";
#endif
- if((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime ) {
+ if ((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
emit notify();
- elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
- timeStamp.restart();
- }
- return true;
- }
+ elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
+ timeStamp.restart();
+ }
+ return true;
+ }
if(startup)
- waveOutPause(hWaveOut);
+ waveOutPause(hWaveOut);
int input = period_size*chunks;
int l = audioSource->read(audioBuffer,input);
if(l > 0) {
@@ -626,8 +626,8 @@ bool QAudioOutputPrivate::deviceReady()
// Didn't write all data
audioSource->seek(audioSource->pos()-(l-out));
}
- if(startup)
- waveOutRestart(hWaveOut);
+ if (startup)
+ waveOutRestart(hWaveOut);
} else if(l == 0) {
bytesAvailable = bytesFree();
@@ -654,7 +654,7 @@ bool QAudioOutputPrivate::deviceReady()
int buffered;
mutex.lock();
- buffered = waveFreeBlockCount;
+ buffered = waveFreeBlockCount;
mutex.unlock();
if (buffered >= buffer_size/period_size && deviceState == QAudio::ActiveState) {
@@ -670,7 +670,7 @@ bool QAudioOutputPrivate::deviceReady()
if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) {
emit notify();
- elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
+ elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime;
timeStamp.restart();
}
diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h
index c09c434f0..67108b94f 100644
--- a/src/multimedia/controls/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
@@ -59,7 +59,7 @@ class Q_MULTIMEDIA_EXPORT QCameraFlashControl : public QMediaControl
public:
~QCameraFlashControl();
-
+
virtual QCameraExposure::FlashModes flashMode() const = 0;
virtual void setFlashMode(QCameraExposure::FlashModes mode) = 0;
virtual bool isFlashModeSupported(QCameraExposure::FlashModes mode) const = 0;
diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h
index 33edeb094..b03ba3752 100644
--- a/src/multimedia/controls/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
@@ -57,7 +57,7 @@ class Q_MULTIMEDIA_EXPORT QCameraLocksControl : public QMediaControl
Q_OBJECT
public:
~QCameraLocksControl();
-
+
virtual QCamera::LockTypes supportedLocks() const = 0;
virtual QCamera::LockStatus lockStatus(QCamera::LockType lock) const = 0;
diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h
index 1ed76fb3a..6c31dbc3f 100644
--- a/src/multimedia/controls/qimageencodercontrol.h
+++ b/src/multimedia/controls/qimageencodercontrol.h
@@ -64,7 +64,7 @@ class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl
Q_OBJECT
public:
- virtual ~QImageEncoderControl();
+ virtual ~QImageEncoderControl();
virtual QStringList supportedImageCodecs() const = 0;
virtual QString imageCodecDescription(const QString &codecName) const = 0;
diff --git a/src/multimedia/doc/src/classic.css b/src/multimedia/doc/src/classic.css
index b8cae8e1e..59fa9dc32 100644
--- a/src/multimedia/doc/src/classic.css
+++ b/src/multimedia/doc/src/classic.css
@@ -34,44 +34,44 @@ hr {
}
table.valuelist {
- border-width: 1px 1px 1px 1px;
- border-style: solid;
- border-color: #dddddd;
- border-collapse: collapse;
- background-color: #f0f0f0;
+ border-width: 1px 1px 1px 1px;
+ border-style: solid;
+ border-color: #dddddd;
+ border-collapse: collapse;
+ background-color: #f0f0f0;
}
table.indextable {
- border-width: 1px 1px 1px 1px;
- border-style: solid;
- border-collapse: collapse;
- background-color: #f0f0f0;
+ border-width: 1px 1px 1px 1px;
+ border-style: solid;
+ border-collapse: collapse;
+ background-color: #f0f0f0;
border-color:#555;
font-size: 100%;
}
table td.largeindex {
- border-width: 1px 1px 1px 1px;
- border-collapse: collapse;
- background-color: #f0f0f0;
+ border-width: 1px 1px 1px 1px;
+ border-collapse: collapse;
+ background-color: #f0f0f0;
border-color:#555;
font-size: 120%;
}
table.valuelist th {
- border-width: 1px 1px 1px 2px;
- padding: 4px;
- border-style: solid;
- border-color: #666;
+ border-width: 1px 1px 1px 2px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #666;
color:white;
background-color:#666;
}
th.titleheader {
- border-width: 1px 0px 1px 0px;
- padding: 2px;
- border-style: solid;
- border-color: #666;
+ border-width: 1px 0px 1px 0px;
+ padding: 2px;
+ border-style: solid;
+ border-color: #666;
color:white;
background-color:#555;
background-image:url('images/gradient.png')};
@@ -81,10 +81,10 @@ th.titleheader {
th.largeheader {
- border-width: 1px 0px 1px 0px;
- padding: 4px;
- border-style: solid;
- border-color: #444;
+ border-width: 1px 0px 1px 0px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #444;
color:white;
background-color:#555555;
font-size: 120%;
@@ -143,7 +143,7 @@ table.generic, table.annotated
{
border-width: 1px;
border-color:#bbb;
- border-style:solid;
+ border-style:solid;
border-collapse:collapse;
}
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
index 42ce913ec..f09bdbd1f 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
@@ -57,7 +57,7 @@ class QGstreamerVideoRenderer : public QVideoRendererControl, public QGstreamerV
public:
QGstreamerVideoRenderer(QObject *parent = 0);
virtual ~QGstreamerVideoRenderer();
-
+
QAbstractVideoSurface *surface() const;
void setSurface(QAbstractVideoSurface *surface);
@@ -73,7 +73,7 @@ signals:
private slots:
void handleFormatChange();
-private:
+private:
QVideoSurfaceGstSink *m_videoSink;
QPointer<QAbstractVideoSurface> m_surface;
};
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 3195ae061..454b0f173 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -150,7 +150,7 @@ public:
int bufferStatus() const;
bool isSeekable() const;
- qreal playbackRate() const;
+ qreal playbackRate() const;
Error error() const;
QString errorString() const;
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)
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);
diff --git a/src/plugins/directshow/player/directshoweventloop.cpp b/src/plugins/directshow/player/directshoweventloop.cpp
index 74f210b9a..a8726eddd 100644
--- a/src/plugins/directshow/player/directshoweventloop.cpp
+++ b/src/plugins/directshow/player/directshoweventloop.cpp
@@ -94,7 +94,7 @@ void DirectShowEventLoop::wait(QMutex *mutex)
HANDLE handles[] = { m_eventHandle, m_waitHandle };
while (::WaitForMultipleObjects(2, handles, false, INFINITE) == WAIT_OBJECT_0)
processEvents();
-
+
mutex->lock();
}
diff --git a/src/plugins/directshow/player/directshowglobal.h b/src/plugins/directshow/player/directshowglobal.h
index b604a8d0e..f2a7fef03 100644
--- a/src/plugins/directshow/player/directshowglobal.h
+++ b/src/plugins/directshow/player/directshowglobal.h
@@ -76,7 +76,7 @@ DECLARE_INTERFACE_(IFilterGraph2 ,IGraphBuilder)
STDMETHOD(ReconnectEx)(THIS_ IPin *, const AM_MEDIA_TYPE *) PURE;
STDMETHOD(RenderEx)(IPin *, DWORD, DWORD *) PURE;
};
-#undef INTERFACE
+#undef INTERFACE
#endif
#ifndef __IAMFilterMiscFlags_INTERFACE_DEFINED__
@@ -89,7 +89,7 @@ DECLARE_INTERFACE_(IAMFilterMiscFlags ,IUnknown)
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD_(ULONG,GetMiscFlags)(THIS) PURE;
};
-#undef INTERFACE
+#undef INTERFACE
#endif
#ifndef __IFileSourceFilter_INTERFACE_DEFINED__
@@ -103,7 +103,7 @@ DECLARE_INTERFACE_(IFileSourceFilter ,IUnknown)
STDMETHOD(Load)(THIS_ LPCOLESTR, const AM_MEDIA_TYPE *) PURE;
STDMETHOD(GetCurFile)(THIS_ LPOLESTR *ppszFileName, AM_MEDIA_TYPE *) PURE;
};
-#undef INTERFACE
+#undef INTERFACE
#endif
#ifndef __IAMOpenProgress_INTERFACE_DEFINED__
@@ -117,7 +117,7 @@ DECLARE_INTERFACE_(IAMOpenProgress ,IUnknown)
STDMETHOD(QueryProgress)(THIS_ LONGLONG *, LONGLONG *) PURE;
STDMETHOD(AbortOperation)(THIS) PURE;
};
-#undef INTERFACE
+#undef INTERFACE
#endif
#ifndef __IFilterChain_INTERFACE_DEFINED__
@@ -133,7 +133,7 @@ DECLARE_INTERFACE_(IFilterChain ,IUnknown)
STDMETHOD(StopChain)(IBaseFilter *, IBaseFilter *) PURE;
STDMETHOD(RemoveChain)(IBaseFilter *, IBaseFilter *) PURE;
};
-#undef INTERFACE
+#undef INTERFACE
#endif
#endif
diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp
index c0ea4ebbd..38928f1ae 100644
--- a/src/plugins/directshow/player/directshowioreader.cpp
+++ b/src/plugins/directshow/player/directshowioreader.cpp
@@ -259,7 +259,7 @@ HRESULT DirectShowIOReader::SyncReadAligned(IMediaSample *pSample)
if (SUCCEEDED(hr))
pSample->SetActualDataLength(bytesRead);
-
+
return hr;
} else {
m_synchronousPosition = position;
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp
index f382b3b9c..acce1de28 100644
--- a/src/plugins/directshow/player/directshowiosource.cpp
+++ b/src/plugins/directshow/player/directshowiosource.cpp
@@ -336,7 +336,7 @@ HRESULT DirectShowIOSource::Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt)
return VFW_E_NOT_STOPPED;
} else if (m_peerPin) {
return VFW_E_ALREADY_CONNECTED;
- } else {
+ } else {
HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED;
m_peerPin = pReceivePin;
@@ -424,7 +424,7 @@ HRESULT DirectShowIOSource::tryConnect(IPin *pin, const AM_MEDIA_TYPE *type)
|| m_allocator->GetProperties(&properties) == S_OK) {
if (properties.cbAlign == 0)
properties.cbAlign = 1;
-
+
ALLOCATOR_PROPERTIES actualProperties;
if (SUCCEEDED(hr = m_allocator->SetProperties(&properties, &actualProperties)))
hr = memPin->NotifyAllocator(m_allocator, TRUE);
@@ -435,7 +435,7 @@ HRESULT DirectShowIOSource::tryConnect(IPin *pin, const AM_MEDIA_TYPE *type)
}
}
memPin->Release();
- }
+ }
if (!SUCCEEDED(hr))
pin->Disconnect();
}
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index d60bce31a..51d9574ba 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -255,7 +255,7 @@ static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key)
WORD word;
if (header->GetAttributeByName(
&streamNumber,
- key,
+ key,
&type,
reinterpret_cast<BYTE *>(&word),
&size) == S_OK) {
diff --git a/src/plugins/directshow/player/directshowplayercontrol.h b/src/plugins/directshow/player/directshowplayercontrol.h
index 175937169..478389de6 100644
--- a/src/plugins/directshow/player/directshowplayercontrol.h
+++ b/src/plugins/directshow/player/directshowplayercontrol.h
@@ -79,7 +79,7 @@ public:
bool isVideoAvailable() const;
bool isSeekable() const;
-
+
QMediaTimeRange availablePlaybackRanges() const;
qreal playbackRate() const;
@@ -140,7 +140,7 @@ private:
bool m_seekable;
QMediaContent m_media;
QString m_errorString;
-
+
};
#endif
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 9d74be592..0afeacb85 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -563,7 +563,7 @@ void DirectShowPlayerService::releaseGraph()
}
m_graph->Abort();
}
-
+
m_pendingTasks = ReleaseGraph;
::SetEvent(m_taskHandle);
@@ -803,7 +803,7 @@ void DirectShowPlayerService::doStop(QMutexLocker *locker)
m_pendingTasks |= Seek;
m_executedTasks &= ~(Play | Pause);
-
+
QCoreApplication::postEvent(this, new QEvent(QEvent::Type(StatusChange)));
}
@@ -852,7 +852,7 @@ void DirectShowPlayerService::doSetRate(QMutexLocker *locker)
seeking->Release();
} else if (m_rate != 1.0) {
- m_rate = 1.0;
+ m_rate = 1.0;
}
QCoreApplication::postEvent(this, new QEvent(QEvent::Type(RateChange)));
}
@@ -980,7 +980,7 @@ void DirectShowPlayerService::setAudioOutput(IBaseFilter *filter)
m_loop->wait(&m_mutex);
}
m_audioOutput->Release();
- }
+ }
m_audioOutput = filter;
diff --git a/src/plugins/directshow/player/directshowsamplescheduler.cpp b/src/plugins/directshow/player/directshowsamplescheduler.cpp
index 36aefa049..2f61784a7 100644
--- a/src/plugins/directshow/player/directshowsamplescheduler.cpp
+++ b/src/plugins/directshow/player/directshowsamplescheduler.cpp
@@ -308,10 +308,10 @@ void DirectShowSampleScheduler::run(REFERENCE_TIME startTime)
for (DirectShowTimedSample *sample = m_head; sample; sample = sample->nextSample()) {
sample->schedule(m_clock, m_startTime, m_timeoutEvent);
}
-
+
if (!(m_state & Flushing))
::ResetEvent(m_flushEvent);
-
+
if (!m_head)
::SetEvent(m_timeoutEvent);
@@ -338,7 +338,7 @@ void DirectShowSampleScheduler::stop()
for (DirectShowTimedSample *sample = m_head; sample; sample = sample->remove()) {
sample->unschedule(m_clock);
-
+
m_semaphore.release(1);
}
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index b8a775bb7..b6cc232ab 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -81,7 +81,7 @@ VideoSurfaceFilter::~VideoSurfaceFilter()
}
HRESULT VideoSurfaceFilter::QueryInterface(REFIID riid, void **ppvObject)
-{
+{
// 2dd74950-a890-11d1-abe8-00a0c905f375
static const GUID iid_IAmFilterMiscFlags = {
0x2dd74950, 0xa890, 0x11d1, {0xab, 0xe8, 0x00, 0xa0, 0xc9, 0x05, 0xf3, 0x75} };
diff --git a/src/plugins/gstreamer/camerabin/camerabinflash.h b/src/plugins/gstreamer/camerabin/camerabinflash.h
index d94b4a87c..f5484101f 100644
--- a/src/plugins/gstreamer/camerabin/camerabinflash.h
+++ b/src/plugins/gstreamer/camerabin/camerabinflash.h
@@ -66,7 +66,7 @@ public:
bool isFlashReady() const;
private:
- CameraBinSession *m_session;
+ CameraBinSession *m_session;
};
QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h
index dab8d84cc..5f66dc748 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.h
@@ -113,7 +113,7 @@ public:
void setCaptureMode(QCamera::CaptureModes mode);
QUrl outputLocation() const;
- bool setOutputLocation(const QUrl& sink);
+ bool setOutputLocation(const QUrl& sink);
QDir defaultDir(QCamera::CaptureModes mode) const;
QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
diff --git a/src/plugins/gstreamer/camerabin/camerabuttonlistener_meego.cpp b/src/plugins/gstreamer/camerabin/camerabuttonlistener_meego.cpp
index c49539df3..2e66360a9 100644
--- a/src/plugins/gstreamer/camerabin/camerabuttonlistener_meego.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabuttonlistener_meego.cpp
@@ -65,7 +65,7 @@ CameraButtonListener::~CameraButtonListener()
void CameraButtonListener::handleQmKeyEvent(MeeGo::QmKeys::Key key, MeeGo::QmKeys::State state)
{
if (key == MeeGo::QmKeys::Camera) {
- QWidget *window = QApplication::focusWidget();
+ QWidget *window = QApplication::focusWidget();
bool focusPressed = (state == MeeGo::QmKeys::KeyHalfDown) ||
(state == MeeGo::QmKeys::KeyDown);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index d61e6a010..da6120181 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -491,7 +491,7 @@ void QGstreamerPlayerSession::setVideoRenderer(QObject *videoOutput)
}
}
- QGstreamerVideoRendererInterface* renderer = qobject_cast<QGstreamerVideoRendererInterface*>(videoOutput);
+ QGstreamerVideoRendererInterface* renderer = qobject_cast<QGstreamerVideoRendererInterface*>(videoOutput);
m_renderer = renderer;
@@ -646,7 +646,7 @@ void QGstreamerPlayerSession::finishVideoOutputChange()
m_pendingVideoSink = 0;
gst_object_unref(GST_OBJECT(srcPad));
return;
- }
+ }
if (m_usingColorspaceElement) {
gst_element_set_state(m_colorSpace, GST_STATE_NULL);
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()