QResource: use QStringView

Saves 240B in QtCore text size on optimized GCC 7 Linux AMD64 builds.

Change-Id: Ifa7b8735027575fbe381896dce608b80ec458ee9
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>

1 files changed, 8 insertions, 10 deletions

diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 32639759e4..57966e0a2d 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -66,10 +66,9 @@ QT_BEGIN_NAMESPACE
 class QStringSplitter
 {
 public:
-    QStringSplitter(const QString &s)
-        : m_string(s), m_data(m_string.constData()), m_len(s.length()), m_pos(0)
+    explicit QStringSplitter(QStringView sv)
+        : m_data(sv.data()), m_len(sv.size())
     {
-        m_splitChar = QLatin1Char('/');
     }
 
     inline bool hasNext() {
@@ -78,18 +77,17 @@ public:
         return m_pos < m_len;
     }
 
-    inline QStringRef next() {
+    inline QStringView next() {
         int start = m_pos;
         while (m_pos < m_len && m_data[m_pos] != m_splitChar)
             ++m_pos;
-        return QStringRef(&m_string, start, m_pos - start);
+        return QStringView(m_data + start, m_pos - start);
     }
 
-    QString m_string;
     const QChar *m_data;
-    QChar m_splitChar;
-    int m_len;
-    int m_pos;
+    qssize_t m_len;
+    qssize_t m_pos = 0;
+    QChar m_splitChar = QLatin1Char('/');
 };
 
 
@@ -678,7 +676,7 @@ int QResourceRoot::findNode(const QString &_path, const QLocale &locale) const
 
     QStringSplitter splitter(path);
     while (child_count && splitter.hasNext()) {
-        QStringRef segment = splitter.next();
+        QStringView segment = splitter.next();
 
 #ifdef DEBUG_RESOURCE_MATCH
         qDebug() << "  CHILDREN" << segment;