From 219e7bafa278792f7bde110d24333fb60b555c12 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 May 2020 15:22:52 +0200 Subject: QtGui: fix deprecated QChar conversions Conversions from non-char-types to QChar are going to be deprecated. Use QChar::fromUcs2(), fromUcs4(), QLatin1Char(), or convert the constructor argument to char16_t. Change-Id: Ib45ebd5560aa3a2bc460037ab09773607485c6e2 Reviewed-by: Volker Hilsheimer --- src/gui/text/qtextdocument.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/text/qtextdocument.cpp') diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 04350bcda5..25a18f56a9 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -183,15 +183,15 @@ QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode) col = 0; } else { if (mode == Qt::WhiteSpacePre && plain[i] == QLatin1Char('\t')){ - rich += QChar(0x00a0U); + rich += QChar::Nbsp; ++col; while (col % 8) { - rich += QChar(0x00a0U); + rich += QChar::Nbsp; ++col; } } else if (mode == Qt::WhiteSpacePre && plain[i].isSpace()) - rich += QChar(0x00a0U); + rich += QChar::Nbsp; else if (plain[i] == QLatin1Char('<')) rich += QLatin1String("<"); else if (plain[i] == QLatin1Char('>')) -- cgit v1.2.3