diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2010-07-18 21:05:44 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-07-18 21:05:47 (GMT) |
| commit | c6812138900b05012831e0f94d7d00aeac86cc2f (patch) | |
| tree | 75c1fd3fbe54fbeb0b131bb71032c813ca6fd086 /tools | |
| parent | 53d3083eecf88a20bc36ada43942c7a18677af62 (diff) | |
| download | Qt-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 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/helpviewer_qwv.cpp | 2 | ||||
| -rw-r--r-- | tools/makeqpf/qpf2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp index dcbbf2c..221e1b8 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -101,7 +101,7 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen) TRACE_OBJ qint64 len = qMin(qint64(data.length()), maxlen); if (len) { - qMemCopy(buffer, data.constData(), len); + memcpy(buffer, data.constData(), len); data.remove(0, len); } if (!data.length()) diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp index ab57cea..cafdb79 100644 --- a/tools/makeqpf/qpf2.cpp +++ b/tools/makeqpf/qpf2.cpp @@ -543,7 +543,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges) ; } - qMemCopy(data, img.bits(), img.byteCount()); + memcpy(data, img.bits(), img.byteCount()); } } } |