slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

whitespace fixes

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2014-01-17 19:27:51 +01:00
committed by The Qt Project
parent b690a4d902
commit 5980bc41cf
54 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/unit/qcamera/tst_qcamera.cpp
View File

@@ -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"));

6
tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
View File

@@ -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);

2
tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
View File

@@ -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());

2
tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
View File

@@ -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);
}

4
tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp
View File

@@ -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));

6
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -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()

2
tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
View File

@@ -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);

2
tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
View File

@@ -799,7 +799,7 @@ void tst_QVideoWidget::aspectRatioRendererControl()
void tst_QVideoWidget::sizeHint_data()
{
QTest::addColumn<QSize>("size");
QTest::newRow("720x576")
<< QSize(720, 576);
}