diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-03-30 21:26:31 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2017-04-04 22:12:25 +0000 |
commit | 89302436cbd3c02cad3e73da9b20159a78bd870b (patch) | |
tree | 72cd3dbc63e95ded2c320c45b0dd5de5d8b567ae /src/corelib/tools/qstringbuilder.h | |
parent | a433614bece5ddaed74b9e9e514bf13b7362fc1a (diff) |
QStringBuilder: add support for (non-const) char*
There's support for const char[] and char[], so it seems this was
simply forgotten.
[ChangeLog][QtCore][QStringBuilder] Added support for (non-const) char*.
Change-Id: I4b5d9039632da7721256579b7741816027321a7e
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qstringbuilder.h')
-rw-r--r-- | src/corelib/tools/qstringbuilder.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 9a40abcfed..5c6d990314 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -303,7 +303,7 @@ template <int N> struct QConcatenable<char[N]> : QConcatenable<const char[N]> template <> struct QConcatenable<const char *> : private QAbstractConcatenable { - typedef char const *type; + typedef const char *type; typedef QByteArray ConvertTo; enum { ExactSize = false }; static int size(const char *a) { return qstrlen(a); } @@ -320,6 +320,11 @@ template <> struct QConcatenable<const char *> : private QAbstractConcatenable } }; +template <> struct QConcatenable<char *> : QConcatenable<const char*> +{ + typedef char *type; +}; + template <> struct QConcatenable<QByteArray> : private QAbstractConcatenable { typedef QByteArray type; |