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 --- .../qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'tests/auto/concurrent/qtconcurrentfilter') diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 69d1535ccf..4ce11f208f 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -100,7 +100,6 @@ void tst_QtConcurrentFilter::filter() QCOMPARE(vector, QVector() << 2 << 4); } - // function { QList list; @@ -554,7 +553,6 @@ void tst_QtConcurrentFilter::filteredReduced() int sum = QtConcurrent::filteredReduced(vector, KeepEvenIntegers(), IntSumReduce()); QCOMPARE(sum, 6); } - { int sum = QtConcurrent::filteredReduced(list.begin(), list.end(), @@ -1396,43 +1394,42 @@ void tst_QtConcurrentFilter::filteredReduced() // ### the same as above, with an initial result value } -bool filterfn(int i) -{ +bool filterfn(int i) +{ return (i % 2); -} +} void tst_QtConcurrentFilter::resultAt() { - QList ints; + QList ints; for (int i=0; i < 1000; ++i) ints << i; QFuture future = QtConcurrent::filtered(ints, filterfn); - future.waitForFinished(); + future.waitForFinished(); - for (int i = 0; i < future.resultCount(); ++i) { QCOMPARE(future.resultAt(i), ints.at(i * 2 + 1)); } } -bool waitFilterfn(const int &i) -{ +bool waitFilterfn(const int &i) +{ QTest::qWait(1); return (i % 2); -} +} void tst_QtConcurrentFilter::incrementalResults() { const int count = 200; - QList ints; + QList ints; for (int i=0; i < count; ++i) ints << i; QFuture future = QtConcurrent::filtered(ints, waitFilterfn); - + QList results; while (future.isFinished() == false) { -- cgit v1.2.3