summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.co.uk>2010-07-18 21:05:44 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2010-07-18 21:05:47 (GMT)
commitc6812138900b05012831e0f94d7d00aeac86cc2f (patch)
tree75c1fd3fbe54fbeb0b131bb71032c813ca6fd086 /src/corelib/tools/qstring.cpp
parent53d3083eecf88a20bc36ada43942c7a18677af62 (diff)
downloadQt-c6812138900b05012831e0f94d7d00aeac86cc2f.zip
Qt-c6812138900b05012831e0f94d7d00aeac86cc2f.tar.gz
Qt-c6812138900b05012831e0f94d7d00aeac86cc2f.tar.bz2
Remove qMemCopy() usage from all .cpp files of Qt itself.
This is (supposedly) more efficient as the compiler can optimise it to a builtin, per Thiago. Merge-request: 2430 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r--src/corelib/tools/qstring.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index b2cf49b..b5651de 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -6156,18 +6156,18 @@ QString QString::repeated(int times) const
if (result.d->alloc != resultSize)
return QString(); // not enough memory
- qMemCopy(result.d->data, d->data, d->size * sizeof(ushort));
+ memcpy(result.d->data, d->data, d->size * sizeof(ushort));
int sizeSoFar = d->size;
ushort *end = result.d->data + sizeSoFar;
const int halfResultSize = resultSize >> 1;
while (sizeSoFar <= halfResultSize) {
- qMemCopy(end, result.d->data, sizeSoFar * sizeof(ushort));
+ memcpy(end, result.d->data, sizeSoFar * sizeof(ushort));
end += sizeSoFar;
sizeSoFar <<= 1;
}
- qMemCopy(end, result.d->data, (resultSize - sizeSoFar) * sizeof(ushort));
+ memcpy(end, result.d->data, (resultSize - sizeSoFar) * sizeof(ushort));
result.d->data[resultSize] = '\0';
result.d->size = resultSize;
return result;