1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "QtConcurrent::Median: add some qMove()"

Browse Source 
This reverts commit 12bd604f241d41d52ab3fde9f4a8f4f5c2f3fa6d.

This causes problems in QtCreator without anyone being able to say why.

Task-number: QTBUG-34397
Change-Id: I7733c3db7d35bba2734e128476aabcb0152a91e4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Marc Mutz 2013-11-04 16:20:23 +01:00 committed by The Qt Project
parent 1d07c72431
commit 0884802bb5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/concurrent/qtconcurrentmedian.h
View File

@ -90,7 +90,7 @@ public:
dirty = true;
}
values[currentIndex] = qMove(value);
values[currentIndex] = value;
}
bool isMedianValid() const
@ -105,7 +105,7 @@ public:
QVector<T> copy = values;
typename QVector<T>::iterator begin = copy.begin(), mid = copy.begin() + bufferSize/2, end = copy.end();
std::nth_element(begin, mid, end);
currentMedian = qMove(*mid);
currentMedian = *mid;
}
return currentMedian;
}