diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-25 14:25:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-11 02:51:03 +0200 |
| commit | d984adac68a70c0a23b411b103a4c8d777d6fb0d (patch) | |
| tree | a519c261a12ef7cb98a3f29830ab53deb8cb9196 /src/gui/image | |
| parent | 82a0f4a193367fc661c95a832fbec74f8e9a76d1 (diff) | |
Port QtGui from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: I1761096fbcc9421a013cf73f831a2a2ba0c18006
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 6 | ||||
| -rw-r--r-- | src/gui/image/qimage.cpp | 6 | ||||
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index ac7a6864f8..00982ca331 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -217,7 +217,7 @@ class QIconCacheGtkReader { public: explicit QIconCacheGtkReader(const QString &themeDir); - QVector<const char *> lookup(const QStringRef &); + QVector<const char *> lookup(QStringView); bool isValid() const { return m_isValid; } private: QFile m_file; @@ -290,7 +290,7 @@ static quint32 icon_name_hash(const char *p) with this name is present. The char* are pointers to the mapped data. For example, this would return { "32x32/apps", "24x24/apps" , ... } */ -QVector<const char *> QIconCacheGtkReader::lookup(const QStringRef &name) +QVector<const char *> QIconCacheGtkReader::lookup(QStringView name) { QVector<const char *> ret; if (!isValid() || name.isEmpty()) @@ -443,7 +443,7 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName, const QStringList contentDirs = theme.contentDirs(); - QStringRef iconNameFallback(&iconName); + QStringView iconNameFallback(iconName); // Iterate through all icon's fallbacks in current theme while (info.entries.isEmpty()) { diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 92a7d05dda..1dc260246c 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -5309,14 +5309,14 @@ QMap<QString, QString> qt_getImageText(const QImage &image, const QString &descr QMap<QString, QString> qt_getImageTextFromDescription(const QString &description) { QMap<QString, QString> text; - const auto pairs = description.splitRef(QLatin1String("\n\n")); - for (const QStringRef &pair : pairs) { + const auto pairs = QStringView{description}.split(u"\n\n"); + for (const auto &pair : pairs) { int index = pair.indexOf(QLatin1Char(':')); if (index >= 0 && pair.indexOf(QLatin1Char(' ')) < index) { if (!pair.trimmed().isEmpty()) text.insert(QLatin1String("Description"), pair.toString().simplified()); } else { - const QStringRef key = pair.left(index); + const auto key = pair.left(index); if (!key.trimmed().isEmpty()) text.insert(key.toString(), pair.mid(index + 2).toString().simplified()); } diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 5738148718..f66ab2778a 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -851,7 +851,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt QMap<QString, QString>::ConstIterator it = text.constBegin(); int i = 0; while (it != text.constEnd()) { - text_ptr[i].key = qstrdup(it.key().leftRef(79).toLatin1().constData()); + text_ptr[i].key = qstrdup(QStringView{it.key()}.left(79).toLatin1().constData()); bool noCompress = (it.value().length() < 40); #ifdef PNG_iTXt_SUPPORTED |