summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qfilesystemiterator_unix.cpp2
-rw-r--r--src/corelib/io/qsettings.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp
index c69138e3ba..cf01eeff15 100644
--- a/src/corelib/io/qfilesystemiterator_unix.cpp
+++ b/src/corelib/io/qfilesystemiterator_unix.cpp
@@ -56,7 +56,7 @@ static bool checkNameDecodable(const char *d_name, qsizetype len)
// This function is called in a loop from advance() below, but the loop is
// usually run only once.
- return QUtf8::isValidUtf8(d_name, len).isValidUtf8;
+ return QUtf8::isValidUtf8(QByteArrayView(d_name, len)).isValidUtf8;
}
QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters,
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 42a0f38be3..547f2759f5 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -667,7 +667,7 @@ void QSettingsPrivate::iniEscapedString(const QString &str, QByteArray &result)
escapeNextIfDigit = true;
} else if (useCodec) {
// slow
- result += toUtf8(&unicode[i], 1);
+ result += toUtf8(unicode[i]);
} else {
result += (char)ch;
}
@@ -815,7 +815,7 @@ StNormal:
++j;
}
- stringResult += fromUtf8(str.constData() + i, j - i);
+ stringResult += fromUtf8(QByteArrayView(str).first(j).sliced(i));
i = j;
}
}