AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStringBuilder: add support for (non-const) char*

Browse Source 
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>
This commit is contained in:
Marc Mutz 2017-03-30 21:26:31 +02:00
parent a433614bec
commit 89302436cb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/tools/qstringbuilder.h
View File

@ -303,7 +303,7 @@ template <int N> struct QConcatenable<char[N]> : QConcatenable<const char[N]>
template <> struct QConcatenable<const char *> : private QAbstractConcatenable template <> struct QConcatenable<const char *> : private QAbstractConcatenable
{ {
typedef char const *type; typedef const char *type;
typedef QByteArray ConvertTo; typedef QByteArray ConvertTo;
enum { ExactSize = false }; enum { ExactSize = false };
static int size(const char *a) { return qstrlen(a); } 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 template <> struct QConcatenable<QByteArray> : private QAbstractConcatenable
{ {
typedef QByteArray type; typedef QByteArray type;