diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-05-18 18:38:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 13:41:55 +0200 |
| commit | 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 (patch) | |
| tree | 79970daa0b1b7e6393653a5363a6883f4896e66c /src/corelib | |
| parent | 64a8c78538275b8dbb9d2cbbb1f7b06b247fbe6b (diff) | |
QStringList::join: add an overload taking a single QChar
This overload avoids the needless heap allocation that the traditional
overload incurs due to the implicit QChar -> QString conversion
involved there.
In order to share the implementation between the two overloads,
QStringList_join now takes the separator as a (Char*,int) tuple
instead of as a QString.
Change-Id: I92961f13a3f19099de2a6e2df9f4789a12fc83a0
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstringlist.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qstringlist.h | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 0f06ad651f..2e32d6d9e9 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -434,7 +434,13 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegularEx \sa QString::split() */ -QString QtPrivate::QStringList_join(const QStringList *that, const QString &sep) + +/*! + \fn QString QStringList::join(QChar separator) const + \since 5.0 + \overload join() +*/ +QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, int seplen) { int totalLength = 0; const int size = that->size(); @@ -443,7 +449,7 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QString &sep) totalLength += that->at(i).size(); if(size > 0) - totalLength += sep.size() * (size - 1); + totalLength += seplen * (size - 1); QString res; if (totalLength == 0) @@ -451,7 +457,7 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QString &sep) res.reserve(totalLength); for (int i = 0; i < that->size(); ++i) { if (i) - res += sep; + res.append(sep, seplen); res += that->at(i); } return res; diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 3e63e30a57..3656b3fa40 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -75,6 +75,7 @@ public: inline int removeDuplicates(); inline QString join(const QString &sep) const; + inline QString join(QChar sep) const; inline QStringList filter(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -122,7 +123,7 @@ Q_DECLARE_TYPEINFO(QStringList, Q_MOVABLE_TYPE); namespace QtPrivate { void Q_CORE_EXPORT QStringList_sort(QStringList *that, Qt::CaseSensitivity cs); int Q_CORE_EXPORT QStringList_removeDuplicates(QStringList *that); - QString Q_CORE_EXPORT QStringList_join(const QStringList *that, const QString &sep); + QString Q_CORE_EXPORT QStringList_join(const QStringList *that, const QChar *sep, int seplen); QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); @@ -161,7 +162,12 @@ inline int QStringList::removeDuplicates() inline QString QStringList::join(const QString &sep) const { - return QtPrivate::QStringList_join(this, sep); + return QtPrivate::QStringList_join(this, sep.constData(), sep.length()); +} + +inline QString QStringList::join(QChar sep) const +{ + return QtPrivate::QStringList_join(this, &sep, 1); } inline QStringList QStringList::filter(const QString &str, Qt::CaseSensitivity cs) const |