summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-05-07 15:22:52 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-05-11 09:02:44 +0000
commit219e7bafa278792f7bde110d24333fb60b555c12 (patch)
tree46b9f9f69552cc7ee2f39e01f846d285c526474a /src/gui/text/qtextdocument.cpp
parent9e56d28663b7df82882d2d0dcc72f3a48bcc6cf9 (diff)
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 <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
-rw-r--r--src/gui/text/qtextdocument.cpp6
1 files changed, 3 insertions, 3 deletions
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("&lt;");
else if (plain[i] == QLatin1Char('>'))