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/text/qfontdatabase.cpp | |
| 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/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 069f9bd5e5..993c37a92f 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -105,7 +105,7 @@ static int getFontWeight(const QString &weightString) return QFont::Light; if (s == QLatin1String("thin")) return QFont::Thin; - const QStringRef s2 = s.midRef(2); + const QStringView s2 = QStringView{s}.mid(2); if (s.startsWith(QLatin1String("ex")) || s.startsWith(QLatin1String("ul"))) { if (s2 == QLatin1String("tralight") || s == QLatin1String("tra light")) return QFont::ExtraLight; @@ -511,11 +511,11 @@ static QStringList familyList(const QFontDef &req) family_list << req.families; if (!req.family.isEmpty()) { - const auto list = req.family.splitRef(QLatin1Char(',')); + const auto list = QStringView{req.family}.split(QLatin1Char(',')); const int numFamilies = list.size(); family_list.reserve(numFamilies); for (int i = 0; i < numFamilies; ++i) { - QStringRef str = list.at(i).trimmed(); + auto str = list.at(i).trimmed(); if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"'))) || (str.startsWith(QLatin1Char('\'')) && str.endsWith(QLatin1Char('\'')))) str = str.mid(1, str.length() - 2); |