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 /tests | |
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 'tests')
8 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 248f80cc7..8c72acb8c 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -274,7 +274,7 @@ void tst_QCamera::testSimpleCameraExposure() cameraExposure->setAutoShutterSpeed(); QVERIFY(cameraExposure->shutterSpeed() < 0); cameraExposure->setManualShutterSpeed(1/128.0); - QVERIFY(cameraExposure->shutterSpeed() < 0); + QVERIFY(cameraExposure->shutterSpeed() < 0); } void tst_QCamera::testSimpleCameraFocus() @@ -292,7 +292,7 @@ void tst_QCamera::testSimpleCameraFocus() QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); QTest::ignoreMessage(QtWarningMsg, "Focus mode selection is not supported"); cameraFocus->setFocusMode(QCameraFocus::ContinuousFocus); - QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); + QCOMPARE(cameraFocus->focusMode(), QCameraFocus::AutoFocus); QCOMPARE(cameraFocus->maximumOpticalZoom(), 1.0); QCOMPARE(cameraFocus->maximumDigitalZoom(), 1.0); @@ -459,7 +459,7 @@ void tst_QCamera::testCameraCapture() QVERIFY(!imageCapture.isReadyForCapture()); - QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); + QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); QSignalSpy errorSignal(&imageCapture, SIGNAL(error(int, QCameraImageCapture::Error,QString))); imageCapture.capture(QString::fromLatin1("/dev/null")); diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index b5db15979..88935221f 100644 --- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -271,7 +271,7 @@ void tst_QGraphicsVideoItem::serviceDestroyed() object.testService = 0; delete service; - + QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object)); QVERIFY(item.boundingRect().isEmpty()); } @@ -330,7 +330,7 @@ void tst_QGraphicsVideoItem::setMediaObject() } void tst_QGraphicsVideoItem::show() -{ +{ QtTestVideoObject object(new QtTestRendererControl); QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem; object.bind(item); @@ -630,7 +630,7 @@ void tst_QGraphicsVideoItem::paint() QtTestVideoObject object(new QtTestRendererControl); QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem; object.bind(item); - + QGraphicsScene graphicsScene; graphicsScene.addItem(item); QGraphicsView graphicsView(&graphicsScene); diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index aa8645d5a..7aa8d7a5a 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -560,7 +560,7 @@ void tst_QMediaPlaylist::readOnlyPlaylist() buffer.seek(0); QSignalSpy errorSignal(&playlist, SIGNAL(loadFailed())); - playlist.load(&buffer, "m3u"); + playlist.load(&buffer, "m3u"); QCOMPARE(errorSignal.size(), 1); QCOMPARE(playlist.error(), QMediaPlaylist::AccessDeniedError); QVERIFY(!playlist.errorString().isEmpty()); diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index 9057e63c4..e39070d5f 100644 --- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -96,7 +96,7 @@ void tst_QMediaServiceProvider::initTestCase() void tst_QMediaServiceProvider::testDefaultProviderAvailable() { - // Must always be a default provider available + // Must always be a default provider available QVERIFY(QMediaServiceProvider::defaultServiceProvider() != 0); } diff --git a/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp index 227c41a10..d90f38b4d 100644 --- a/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp +++ b/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp @@ -269,7 +269,7 @@ void tst_QMediaTimeRange::testEarliestLatest() } void tst_QMediaTimeRange::testContains() -{ +{ // Test over a single interval QMediaTimeRange x(10, 20); @@ -282,7 +282,7 @@ void tst_QMediaTimeRange::testContains() // Test over multiple intervals x.addInterval(40, 50); - + QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); QVERIFY(x.contains(15)); diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 2f6152712..183714567 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -102,7 +102,7 @@ public: { glGenTextures(1, &m_textureId); } - + ~QtTestGLVideoBuffer() { glDeleteTextures(1, &m_textureId); @@ -114,7 +114,7 @@ public: uchar *map(MapMode, int *, int *) { return 0; } void unmap() {} - MapMode mapMode() const { return NotMapped; } + MapMode mapMode() const { return NotMapped; } private: GLuint m_textureId; @@ -131,7 +131,7 @@ public: uchar *map(MapMode, int *, int *) { return 0; } void unmap() {} - MapMode mapMode() const { return NotMapped; } + MapMode mapMode() const { return NotMapped; } }; void tst_QPainterVideoSurface::colors() diff --git a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp index d14077af2..01085e202 100644 --- a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp +++ b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp @@ -112,7 +112,7 @@ void tst_QRadioTuner::initTestCase() QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State))); - QCOMPARE(radio->state(), QRadioTuner::StoppedState); + QCOMPARE(radio->state(), QRadioTuner::StoppedState); radio->start(); QVERIFY(radio->availability() == QMultimedia::Available); QCOMPARE(radio->state(), QRadioTuner::ActiveState); diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp index 15cff99d7..c6c9bc113 100644 --- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp @@ -799,7 +799,7 @@ void tst_QVideoWidget::aspectRatioRendererControl() void tst_QVideoWidget::sizeHint_data() { QTest::addColumn<QSize>("size"); - + QTest::newRow("720x576") << QSize(720, 576); } |