diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /examples/opengl/hellogl_es2 | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'examples/opengl/hellogl_es2')
-rw-r--r-- | examples/opengl/hellogl_es2/bubble.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/glwidget.cpp | 4 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/glwidget.h | 2 | ||||
-rw-r--r-- | examples/opengl/hellogl_es2/mainwindow.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/opengl/hellogl_es2/bubble.cpp b/examples/opengl/hellogl_es2/bubble.cpp index 50d64f37da..3e0f053bc8 100644 --- a/examples/opengl/hellogl_es2/bubble.cpp +++ b/examples/opengl/hellogl_es2/bubble.cpp @@ -114,7 +114,7 @@ void Bubble::move(const QRect &bbox) qreal rightOverflow = position.x() + radius - bbox.right(); qreal topOverflow = position.y() - radius - bbox.top(); qreal bottomOverflow = position.y() + radius - bbox.bottom(); - + if (leftOverflow < 0.0) { position.setX(position.x() - 2 * leftOverflow); vel.setX(-vel.x()); diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp index 2727c73fa5..a5c22447f0 100644 --- a/examples/opengl/hellogl_es2/glwidget.cpp +++ b/examples/opengl/hellogl_es2/glwidget.cpp @@ -70,7 +70,7 @@ void GLWidget::setScaling(int scale) { m_fScale = 1 + qreal(scale -50) / 50 * 0.5; else if (scale < 50) m_fScale = 1- (qreal(50 - scale) / 50 * 1/2); - else + else m_fScale = 1; } @@ -316,7 +316,7 @@ void GLWidget::paintGL() painter.drawText(20, 40, framesPerSecond + " fps"); painter.end(); - + swapBuffers(); QMutableListIterator<Bubble*> iter(bubbles); diff --git a/examples/opengl/hellogl_es2/glwidget.h b/examples/opengl/hellogl_es2/glwidget.h index 4536dc3749..8ed86b1e01 100644 --- a/examples/opengl/hellogl_es2/glwidget.h +++ b/examples/opengl/hellogl_es2/glwidget.h @@ -55,7 +55,7 @@ class GLWidget : public QGLWidget { public: GLWidget(QWidget *parent = 0); ~GLWidget(); -public slots: +public slots: void setScaling(int scale); void setLogo(); void setTexture(); diff --git a/examples/opengl/hellogl_es2/mainwindow.cpp b/examples/opengl/hellogl_es2/mainwindow.cpp index a9db386c4c..eb4ce0ac3e 100644 --- a/examples/opengl/hellogl_es2/mainwindow.cpp +++ b/examples/opengl/hellogl_es2/mainwindow.cpp @@ -57,7 +57,7 @@ MainWindow::MainWindow() QTimer *timer = new QTimer(this); QSlider *slider = new QSlider(this); slider->setOrientation(Qt::Horizontal); - + slider->setRange(0, 100); slider->setSliderPosition(50); timer->setInterval(10); |