summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-08-13 13:17:07 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2021-01-08 12:40:53 +0100
commitc9c598d4d76b703f84ace9d2d06b099e8bcf2b07 (patch)
treedbcede05d0e5de052f74bb8490f41226893c2c41 /src/corelib/tools
parentd3399092dbe32f3b1a21fd2c13b2e530b4c9b1f6 (diff)
Mark places where we missed conversion to unicode character types
We should use char32_t for the toUcs4() methods of QString and QStringView and use char16_t for QString::utf16(), thereby matching QStringView. These naturally imply knock-on changes in various places. Unfortunately, we didn't make those changes in Qt 6, so they'll have to wait for Qt 7. Change-Id: I18451d4b31b76658092e19d3fcbc8bc0fe5ce307 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qlist.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 1649310a1d..662fede6f7 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -933,6 +933,7 @@ qsizetype erase_if(QList<T> &list, Predicate pred)
return QtPrivate::sequential_erase_if(list, pred);
}
+// ### Qt 7 char32_t
QList<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); }
QT_END_NAMESPACE