summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-05-05 23:52:05 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-05-06 08:52:55 +0200
commit1c417ef0cbcd94a175d9b01995d000b357d9047f (patch)
tree84bfb7090bd764bbfb1769df144873aab4dfa131 /src/corelib/io
parent490859cdc9bd7b1c61eea5e65e664a89262d1261 (diff)
QSettings: prepare for QChar::unicode() return type change
The return type will change from ushort to char16_t, and while for the vast majority of the users, this will be a non-breaking change, this code here would fail. Fix by using an auto variable, as it should have been from the onset. Change-Id: I8e3a0f3b38d83434665ee50aa8946b0edbcf133a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qsettings_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index 6eb318006e..7a4c1b5f02 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -102,7 +102,7 @@ static QString escapedKey(QString uKey)
QChar *data = uKey.data();
int l = uKey.length();
for (int i = 0; i < l; ++i) {
- ushort &ucs = data[i].unicode();
+ auto &ucs = data[i].unicode();
if (ucs == '\\')
ucs = '/';
else if (ucs == '/')