From 0206c1e4e7f9d38d7815ff0fd5a225398a65c6cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 4 Oct 2013 15:33:00 +0200 Subject: QtConcurrent: remove a using declaration in a header file See Sutter/Alexandrescu, Item 59, for rationale. Change-Id: Ie689e2a00f9ed0fce1ccfdb77c943dd1b1beb4dc Reviewed-by: Olivier Goffart --- src/concurrent/qtconcurrentfilterkernel.h | 12 ++++++------ src/concurrent/qtconcurrentiteratekernel.h | 2 -- src/concurrent/qtconcurrentmapkernel.h | 12 ++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/concurrent') diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index 63e77ab40d..29bb3c942a 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -120,11 +120,11 @@ public: typename Sequence::const_iterator it = sequenceBeginIterator; - advance(it, begin); + std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); - advance(it, 1); + std::advance(it, 1); } reducer.runReduce(reduce, reducedResult, results); @@ -206,11 +206,11 @@ public: results.vector.reserve(end - begin); Iterator it = sequenceBeginIterator; - advance(it, begin); + std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); - advance(it, 1); + std::advance(it, 1); } reducer.runReduce(reduce, reducedResult, results); @@ -282,11 +282,11 @@ public: results.vector.reserve(count); Iterator it = sequenceBeginIterator; - advance(it, begin); + std::advance(it, begin); for (int i = begin; i < end; ++i) { if (keep(*it)) results.vector.append(*it); - advance(it, 1); + std::advance(it, 1); } this->reportResults(results.vector, begin, count); diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 70a7f161de..b47c30aef6 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE namespace QtConcurrent { - using std::advance; - /* The BlockSizeManager class manages how many iterations a thread should reserve and process at a time. This is done by measuring the time spent diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index 6817cd3e29..36e9cd3527 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -75,10 +75,10 @@ public: bool runIterations(Iterator sequenceBeginIterator, int beginIndex, int endIndex, void *) { Iterator it = sequenceBeginIterator; - advance(it, beginIndex); + std::advance(it, beginIndex); for (int i = beginIndex; i < endIndex; ++i) { runIteration(it, i, 0); - advance(it, 1); + std::advance(it, 1); } return false; @@ -129,10 +129,10 @@ public: results.vector.reserve(end - begin); Iterator it = sequenceBeginIterator; - advance(it, begin); + std::advance(it, begin); for (int i = begin; i < end; ++i) { results.vector.append(map(*(it))); - advance(it, 1); + std::advance(it, 1); } reducer.runReduce(reduce, reducedResult, results); @@ -183,10 +183,10 @@ public: { Iterator it = sequenceBeginIterator; - advance(it, begin); + std::advance(it, begin); for (int i = begin; i < end; ++i) { runIteration(it, i, results + (i - begin)); - advance(it, 1); + std::advance(it, 1); } return true; -- cgit v1.2.3