diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:03:57 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 22:36:39 +0200 |
commit | 5700071ac33b1490716c91f52edf5b1444201fc0 (patch) | |
tree | 11e501fdb0dc6e77ad08def3637dd5dc2679788b /src/corelib/tools/qvarlengtharray.h | |
parent | 47d79be39a5bb5f6cf3ed1213d3bad2917d86d26 (diff) |
Remove qCopy from QVarLengthArray
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I854f64ebd6d83718b1bcb3c70a1697e38243296c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qvarlengtharray.h')
-rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index d9b85c4173..34a64dafe2 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -49,6 +49,7 @@ #include <new> #include <string.h> #include <stdlib.h> +#include <algorithm> QT_BEGIN_NAMESPACE @@ -396,7 +397,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA int l = int(aend - ptr); int n = l - f; if (QTypeInfo<T>::isComplex) { - qCopy(ptr + l, ptr + s, ptr + f); + std::copy(ptr + l, ptr + s, ptr + f); T *i = ptr + s; T *b = ptr + s - n; while (i != b) { |