From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: 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 --- examples/opengl/cube/geometryengine.cpp | 2 +- examples/opengl/cube/mainwidget.cpp | 2 +- examples/opengl/grabber/glwidget.cpp | 2 +- examples/opengl/grabber/glwidget.h | 2 +- examples/opengl/hellogl_es2/bubble.cpp | 2 +- examples/opengl/hellogl_es2/glwidget.cpp | 4 ++-- examples/opengl/hellogl_es2/glwidget.h | 2 +- examples/opengl/hellogl_es2/mainwindow.cpp | 2 +- examples/opengl/overpainting/bubble.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/opengl') diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index d573ade1e7..bf63934656 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -50,7 +50,7 @@ struct VertexData }; GeometryEngine::GeometryEngine() -{ +{ } GeometryEngine::~GeometryEngine() diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 0ba859c6b8..8c87de6736 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -68,7 +68,7 @@ void MainWidget::mouseReleaseEvent(QMouseEvent *e) // Mouse release position - mouse press position QVector2D diff = QVector2D(e->localPos()) - mousePressPosition; - // Rotation axis is perpendicular to the mouse position difference + // Rotation axis is perpendicular to the mouse position difference // vector QVector3D n = QVector3D(diff.y(), diff.x(), 0.0).normalized(); diff --git a/examples/opengl/grabber/glwidget.cpp b/examples/opengl/grabber/glwidget.cpp index f9e866b7c8..abe3a8540a 100644 --- a/examples/opengl/grabber/glwidget.cpp +++ b/examples/opengl/grabber/glwidget.cpp @@ -116,7 +116,7 @@ void GLWidget::initializeGL() gear3 = makeGear(reflectance3, 1.3, 2.0, 0.5, 0.7, 10); glEnable(GL_NORMALIZE); - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); } void GLWidget::paintGL() diff --git a/examples/opengl/grabber/glwidget.h b/examples/opengl/grabber/glwidget.h index 91e10edb6e..976d22a421 100644 --- a/examples/opengl/grabber/glwidget.h +++ b/examples/opengl/grabber/glwidget.h @@ -90,7 +90,7 @@ private: int yRot; int zRot; int gear1Rot; - + QPoint lastPos; }; 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 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); diff --git a/examples/opengl/overpainting/bubble.cpp b/examples/opengl/overpainting/bubble.cpp index c64cca7e0d..dbcb72bc93 100644 --- a/examples/opengl/overpainting/bubble.cpp +++ b/examples/opengl/overpainting/bubble.cpp @@ -85,7 +85,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()); -- cgit v1.2.3