diff options
Diffstat (limited to 'src/corelib/tools/qstringbuilder.h')
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 489357f5fd..f0670999d7 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -65,6 +65,7 @@ protected: { *out++ = QLatin1Char(a); } + static void appendLatin1To(const char *a, int len, QChar *out); }; template <typename T> struct QConcatenable {}; @@ -222,7 +223,7 @@ template <> struct QConcatenable<QCharRef> : private QAbstractConcatenable { *out++ = QChar(c); } }; -template <> struct QConcatenable<QLatin1String> +template <> struct QConcatenable<QLatin1String> : private QAbstractConcatenable { typedef QLatin1String type; typedef QString ConvertTo; @@ -230,10 +231,8 @@ template <> struct QConcatenable<QLatin1String> static int size(const QLatin1String a) { return a.size(); } static inline void appendTo(const QLatin1String a, QChar *&out) { - if (a.data()) { - for (const char *s = a.data(); *s; ) - *out++ = QLatin1Char(*s++); - } + appendLatin1To(a.latin1(), a.size(), out); + out += a.size(); } static inline void appendTo(const QLatin1String a, char *&out) { |