diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-10-08 10:13:50 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-10-08 23:21:14 +0200 |
commit | 0683de205f1d5f54e7fe62a5be5ad43d6de15a9e (patch) | |
tree | 6459572ff741eb06303c052c6830234d4ed8449d /src/concurrent | |
parent | 00e8f044e1954ea47f1f0c5c5ff35fff97b732be (diff) |
QtConcurrent: fix warning about function parameters shadowing class members
No functional change.
Change-Id: I76aa01e8eb044c794d518ca72e6861cf95060dfc
Fixes: QTBUG-79071
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent')
-rw-r--r-- | src/concurrent/qtconcurrentmapkernel.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index 87fcf30cf9..7c9538a015 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -118,16 +118,16 @@ public: return false; } - bool runIterations(Iterator sequenceBeginIterator, int begin, int end, ReducedResultType *) override + bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, ReducedResultType *) override { IntermediateResults<typename MapFunctor::result_type> results; - results.begin = begin; - results.end = end; - results.vector.reserve(end - begin); + results.begin = beginIndex; + results.end = endIndex; + results.vector.reserve(endIndex - beginIndex); Iterator it = sequenceBeginIterator; - std::advance(it, begin); - for (int i = begin; i < end; ++i) { + std::advance(it, beginIndex); + for (int i = beginIndex; i < endIndex; ++i) { results.vector.append(map(*(it))); std::advance(it, 1); } @@ -176,13 +176,13 @@ public: return true; } - bool runIterations(Iterator sequenceBeginIterator, int begin, int end, T *results) override + bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, T *results) override { Iterator it = sequenceBeginIterator; - std::advance(it, begin); - for (int i = begin; i < end; ++i) { - runIteration(it, i, results + (i - begin)); + std::advance(it, beginIndex); + for (int i = beginIndex; i < endIndex; ++i) { + runIteration(it, i, results + (i - beginIndex)); std::advance(it, 1); } |