From 5700071ac33b1490716c91f52edf5b1444201fc0 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 3 Sep 2013 00:03:57 +0200 Subject: [PATCH] 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 --- src/corelib/tools/qvarlengtharray.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 #include #include +#include QT_BEGIN_NAMESPACE @@ -396,7 +397,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray::iterator QVarLengthA int l = int(aend - ptr); int n = l - f; if (QTypeInfo::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) {