diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
| commit | b3d030df07ba59059e3d6ecf6e1967cbf1f30d49 (patch) | |
| tree | e0a939a1381c2b983c7fdc79c5f116f87b3a3bc6 /src/corelib/tools/qstringbuilder.h | |
| parent | 93ad359f93de72ef8c4d5f0073dc20ba22b9023c (diff) | |
| parent | a6ea9ce6990003856ecadcca8ce9ddf37949363d (diff) | |
| download | Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.zip Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.gz Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'src/corelib/tools/qstringbuilder.h')
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 3b43253..463c32d 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -163,7 +163,7 @@ template <> struct QConcatenable<QString> static inline void appendTo(const QString &a, QChar *&out) { const int n = a.size(); - memcpy(out, (char*)a.constData(), sizeof(QChar) * n); + memcpy(out, reinterpret_cast<const char*>(a.constData()), sizeof(QChar) * n); out += n; } }; @@ -175,7 +175,7 @@ template <> struct QConcatenable<QStringRef> static inline void appendTo(QStringRef a, QChar *&out) { const int n = a.size(); - memcpy(out, (char*)a.constData(), sizeof(QChar) * n); + memcpy(out, reinterpret_cast<const char*>(a.constData()), sizeof(QChar) * n); out += n; } }; |