summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets
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 /examples/multimediawidgets
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 'examples/multimediawidgets')
-rw-r--r--examples/multimediawidgets/camera/camera.cpp4
-rw-r--r--examples/multimediawidgets/player/doc/src/player.qdoc16
-rw-r--r--examples/multimediawidgets/player/player.cpp2
-rw-r--r--examples/multimediawidgets/videographicsitem/main.cpp2
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index bd0644db6..adb54ef55 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -301,7 +301,7 @@ void Camera::updateLockStatus(QCamera::LockStatus status, QCamera::LockChangeRea
ui->lockButton->setText(tr("Focusing..."));
break;
case QCamera::Locked:
- indicationColor = Qt::darkGreen;
+ indicationColor = Qt::darkGreen;
ui->lockButton->setText(tr("Unlock"));
ui->statusbar->showMessage(tr("Focused"), 2000);
break;
@@ -352,7 +352,7 @@ void Camera::updateCaptureMode()
void Camera::updateCameraState(QCamera::State state)
{
- switch (state) {
+ switch (state) {
case QCamera::ActiveState:
ui->actionStartCamera->setEnabled(false);
ui->actionStopCamera->setEnabled(true);
diff --git a/examples/multimediawidgets/player/doc/src/player.qdoc b/examples/multimediawidgets/player/doc/src/player.qdoc
index 7a7230914..2dfb7c3d0 100644
--- a/examples/multimediawidgets/player/doc/src/player.qdoc
+++ b/examples/multimediawidgets/player/doc/src/player.qdoc
@@ -71,24 +71,24 @@
slider) or the QVideoWidget object will update the other object.
\code
- connect(brightnessSlider, SIGNAL(sliderMoved(int)), videoWidget,
+ connect(brightnessSlider, SIGNAL(sliderMoved(int)), videoWidget,
SLOT(setBrightness(int)));
- connect(videoWidget, SIGNAL(brightnessChanged(int)),
+ connect(videoWidget, SIGNAL(brightnessChanged(int)),
brightnessSlider, SLOT(setValue(int)));
- connect(contrastSlider, SIGNAL(sliderMoved(int)), videoWidget,
+ connect(contrastSlider, SIGNAL(sliderMoved(int)), videoWidget,
SLOT(setContrast(int)));
- connect(videoWidget, SIGNAL(contrastChanged(int)), contrastSlider,
+ connect(videoWidget, SIGNAL(contrastChanged(int)), contrastSlider,
SLOT(setValue(int)));
- connect(hueSlider, SIGNAL(sliderMoved(int)), videoWidget,
+ connect(hueSlider, SIGNAL(sliderMoved(int)), videoWidget,
SLOT(setHue(int)));
- connect(videoWidget, SIGNAL(hueChanged(int)), hueSlider,
+ connect(videoWidget, SIGNAL(hueChanged(int)), hueSlider,
SLOT(setValue(int)));
- connect(saturationSlider, SIGNAL(sliderMoved(int)), videoWidget,
+ connect(saturationSlider, SIGNAL(sliderMoved(int)), videoWidget,
SLOT(setSaturation(int)));
- connect(videoWidget, SIGNAL(saturationChanged(int)),
+ connect(videoWidget, SIGNAL(saturationChanged(int)),
saturationSlider, SLOT(setValue(int)));
\endcode
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index 377a0ffb9..843b9ecb4 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -95,7 +95,7 @@ Player::Player(QWidget *parent)
labelDuration = new QLabel(this);
connect(slider, SIGNAL(sliderMoved(int)), this, SLOT(seek(int)));
-
+
labelHistogram = new QLabel(this);
labelHistogram->setText("Histogram:");
histogram = new HistogramWidget(this);
diff --git a/examples/multimediawidgets/videographicsitem/main.cpp b/examples/multimediawidgets/videographicsitem/main.cpp
index 92c0b066e..159ca02ee 100644
--- a/examples/multimediawidgets/videographicsitem/main.cpp
+++ b/examples/multimediawidgets/videographicsitem/main.cpp
@@ -49,6 +49,6 @@ int main(int argc, char **argv)
VideoPlayer player;
player.show();
- return app.exec();
+ return app.exec();
}