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 --- tests/manual/repaint/mainwindow/main.cpp | 10 +++++----- tests/manual/repaint/scrollarea/main.cpp | 4 +--- tests/manual/repaint/splitter/main.cpp | 2 +- tests/manual/repaint/tableview/main.cpp | 5 ++--- tests/manual/repaint/task141091/main.cpp | 11 ++++++----- tests/manual/repaint/widget/main.cpp | 8 ++++---- 6 files changed, 19 insertions(+), 21 deletions(-) (limited to 'tests/manual/repaint') diff --git a/tests/manual/repaint/mainwindow/main.cpp b/tests/manual/repaint/mainwindow/main.cpp index 173f81de06..eb3096a59c 100644 --- a/tests/manual/repaint/mainwindow/main.cpp +++ b/tests/manual/repaint/mainwindow/main.cpp @@ -47,16 +47,16 @@ int main(int argc, char **argv) QApplication app(argc, argv); QMainWindow mainWindow; - + mainWindow.setCentralWidget(new StaticWidget()); mainWindow.setStatusBar(new QStatusBar()); - + QDockWidget *dockWidget = new QDockWidget(); dockWidget->setWidget(new StaticWidget()); mainWindow.addDockWidget(Qt::LeftDockWidgetArea, dockWidget); - + QToolBar *toolBar = new QToolBar(); - + toolBar->addWidget(new StaticWidget())->setVisible(true);; toolBar->addWidget(new QSpinBox())->setVisible(true);; @@ -64,6 +64,6 @@ int main(int argc, char **argv) mainWindow.resize(600, 400); mainWindow.show(); - + return app.exec(); } diff --git a/tests/manual/repaint/scrollarea/main.cpp b/tests/manual/repaint/scrollarea/main.cpp index 44b43c30f7..6102ab8ee8 100644 --- a/tests/manual/repaint/scrollarea/main.cpp +++ b/tests/manual/repaint/scrollarea/main.cpp @@ -42,7 +42,6 @@ #include #include "../shared/shared.h" - int main(int argc, char **argv) { QApplication app(argc, argv); @@ -57,8 +56,7 @@ int main(int argc, char **argv) scrollView.resize(600, 400); scrollView.show(); - - + return app.exec(); } diff --git a/tests/manual/repaint/splitter/main.cpp b/tests/manual/repaint/splitter/main.cpp index 5ee1e19402..2c01053ae1 100644 --- a/tests/manual/repaint/splitter/main.cpp +++ b/tests/manual/repaint/splitter/main.cpp @@ -53,6 +53,6 @@ int main(int argc, char **argv) splitter.resize(600, 400); splitter.show(); - + return app.exec(); } diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp index 442b1668e0..71f8209d6d 100644 --- a/tests/manual/repaint/tableview/main.cpp +++ b/tests/manual/repaint/tableview/main.cpp @@ -45,7 +45,7 @@ class CellWidget : public QWidget { public: - CellWidget (QWidget *parent = 0) : QWidget(parent) { } + CellWidget(QWidget *parent = 0) : QWidget(parent) {} void paintEvent(QPaintEvent * event) { static int value = 200; @@ -69,8 +69,7 @@ int main(int argc, char **argv) tableWidget.setCellWidget(row, col, new CellWidget()); tableWidget.resize(400, 600); tableWidget.show(); - - + return app.exec(); } diff --git a/tests/manual/repaint/task141091/main.cpp b/tests/manual/repaint/task141091/main.cpp index d2b0f76606..b5b6ae92d7 100644 --- a/tests/manual/repaint/task141091/main.cpp +++ b/tests/manual/repaint/task141091/main.cpp @@ -45,11 +45,12 @@ class MyWidget : public QWidget { public: - MyWidget() : QWidget() { - - + MyWidget() : QWidget() + { setAttribute(Qt::WA_OpaquePaintEvent); - setAttribute(Qt::WA_StaticContents); } + setAttribute(Qt::WA_StaticContents); + } + protected: void paintEvent(QPaintEvent *e) { qDebug() << e->rect(); } }; @@ -60,4 +61,4 @@ int main(int argc, char **argv) MyWidget w; w.show(); return a.exec(); -} \ No newline at end of file +} diff --git a/tests/manual/repaint/widget/main.cpp b/tests/manual/repaint/widget/main.cpp index 520b3e22f5..22011a160c 100644 --- a/tests/manual/repaint/widget/main.cpp +++ b/tests/manual/repaint/widget/main.cpp @@ -108,24 +108,24 @@ protected: QPushButton * resizeButton; QPushButton * movebutton; QPushButton * moveResizebutton; - QPushButton * scrollbutton; + QPushButton * scrollbutton; }; int main(int argc, char **argv) { QApplication app(argc, argv); - + TopLevel bc; bc.resize(500, 500); c = new Child(&bc); c->move(100, 100); c->resize(100, 100); - + QWidget *gc = new StaticWidget(c); gc->move(20, 20); gc->resize(50,50); - + bc.show(); return app.exec(); -- cgit v1.2.3