summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstringiterator_p.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-02-04 13:05:06 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2017-04-03 15:41:09 +0000
commitd40dcee642c69784f771aae86531ae65b458f1a5 (patch)
treecc96f153042a48a770e6b34fe200e7e95c877707 /src/corelib/tools/qstringiterator_p.h
parentb8c61c6bb35c49fc8a6aed4925e59ba1694eab19 (diff)
QStringIterator: port to QStringView
Pretty straightforward, as the implementation already used only an iterator range internally. Change-Id: I6e6b809329e2e2548bba6db414a3d107d09637d1 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qstringiterator_p.h')
-rw-r--r--src/corelib/tools/qstringiterator_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/tools/qstringiterator_p.h
index 7cf59ae42f..749ba0e62d 100644
--- a/src/corelib/tools/qstringiterator_p.h
+++ b/src/corelib/tools/qstringiterator_p.h
@@ -60,12 +60,12 @@ QT_BEGIN_NAMESPACE
class QStringIterator
{
QString::const_iterator i, pos, e;
-
+ Q_STATIC_ASSERT((std::is_same<QString::const_iterator, const QChar *>::value));
public:
- inline explicit QStringIterator(const QString &string)
- : i(string.constBegin()),
- pos(string.constBegin()),
- e(string.constEnd())
+ explicit QStringIterator(QStringView string, QStringView::size_type idx = 0)
+ : i(string.begin()),
+ pos(i + idx),
+ e(string.end())
{
}