From fa8d021fa6fcb040fb702b6ffd2deee52a3b748a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 30 Jul 2020 17:36:14 +0200 Subject: Convert a couple of APIs to use views Try to get rid of APIs that use raw 'const {char, QChar} *, length' pairs. Instead, use QByteArrayView or QStringView. As QStringConverter is a new class, simply change the API to what we'd like to have. Also adjust hidden API in QStringBuilder and friends. Change-Id: I897d47f63a7b965f5574a1e51da64147f9e981f6 Reviewed-by: Lars Knoll --- examples/widgets/richtext/textedit/textedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/widgets') diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index e2d373ceba..194e1e3d92 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -418,7 +418,7 @@ bool TextEdit::load(const QString &f) QByteArray data = file.readAll(); QMimeDatabase db; if (db.mimeTypeForFileNameAndData(f, data).name() == QLatin1String("text/html")) { - auto encoding = QStringDecoder::encodingForHtml(data.constData(), data.size()); + auto encoding = QStringDecoder::encodingForHtml(data); QString str = QStringDecoder(encoding ? *encoding : QStringDecoder::Utf8)(data); QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename); textEdit->document()->setBaseUrl(baseUrl); -- cgit v1.2.3