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 /src/corelib/thread/qresultstore.cpp | |
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 'src/corelib/thread/qresultstore.cpp')
-rw-r--r-- | src/corelib/thread/qresultstore.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp index 940fd45027..65c2437064 100644 --- a/src/corelib/thread/qresultstore.cpp +++ b/src/corelib/thread/qresultstore.cpp @@ -97,7 +97,7 @@ bool ResultIteratorBase::canIncrementVectorIndex() const return (m_vectorIndex + 1 < mapIterator.value().m_count); } -ResultStoreBase::ResultStoreBase() +ResultStoreBase::ResultStoreBase() : insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { } void ResultStoreBase::setFilterMode(bool enable) @@ -148,7 +148,7 @@ void ResultStoreBase::syncPendingResults() // check if we can insert any of the pending results: QMap<int, ResultItem>::iterator it = pendingResults.begin(); while (it != pendingResults.end()) { - int index = it.key(); + int index = it.key(); if (index != resultCount + filteredResults) break; @@ -165,7 +165,7 @@ int ResultStoreBase::addResult(int index, const void *result) return insertResultItem(index, resultItem); } -int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) +int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) { if (m_filterMode == false || vectorSize == totalCount) { ResultItem resultItem(results, vectorSize); @@ -218,7 +218,7 @@ ResultIteratorBase ResultStoreBase::resultAt(int index) const } const int vectorIndex = index - it.key(); - + if (vectorIndex >= it.value().count()) return ResultIteratorBase(m_results.end()); else if (it.value().isVector() == false && vectorIndex != 0) |