diff options
Diffstat (limited to 'src/corelib/tools/qstringbuilder.h')
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index e09b02b5a9..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 {}; @@ -112,7 +113,9 @@ private: const uint len = QConcatenable< QStringBuilder<A, B> >::size(*this); T s(len, Qt::Uninitialized); - typename T::iterator d = s.data(); + // we abuse const_cast / constData here because we know we've just + // allocated the data and we're the only reference count + typename T::iterator d = const_cast<typename T::iterator>(s.constData()); typename T::const_iterator const start = d; QConcatenable< QStringBuilder<A, B> >::appendTo(*this, d); @@ -220,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; @@ -228,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) { |