From ada608d46d7ab99b787e48003f8c94c1a11dab19 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 30 Apr 2020 14:31:46 +0200 Subject: Get rid of QTextCodec in the textedit example And refactor the code a bit to not convert to unicode twice and use the mime database instead of Qt::mightBeRichText(). Change-Id: I56f9a732c8ad593e7f050eaad401be536bdf6f98 Reviewed-by: Thiago Macieira Reviewed-by: David Faure --- examples/widgets/richtext/textedit/textedit.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 9b5425240d..945869c88c 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -417,20 +416,19 @@ bool TextEdit::load(const QString &f) return false; QByteArray data = file.readAll(); - QTextCodec *codec = Qt::codecForHtml(data); - QString str = codec->toUnicode(data); - if (Qt::mightBeRichText(str)) { + QMimeDatabase db; + if (db.mimeTypeForFileNameAndData(f, data).name() == QLatin1String("text/html")) { + auto encoding = QStringDecoder::encodingForHtml(data.constData(), data.size()); + 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); textEdit->setHtml(str); - } else { #if QT_CONFIG(textmarkdownreader) - QMimeDatabase db; - if (db.mimeTypeForFileNameAndData(f, data).name() == QLatin1String("text/markdown")) - textEdit->setMarkdown(QString::fromUtf8(data)); - else + } else if (db.mimeTypeForFileNameAndData(f, data).name() == QLatin1String("text/markdown")) { + textEdit->setMarkdown(QString::fromUtf8(data)); #endif - textEdit->setPlainText(QString::fromUtf8(data)); + } else { + textEdit->setPlainText(QString::fromUtf8(data)); } setCurrentFileName(f); -- cgit v1.2.3