Replace uses of QString::fromUtf16(ushort*) with (char16_t*)

Ditto fromUcs4(uint*) with fromUcs4(char32_t*).

The ushort/uint forms will be deprecated.

Change-Id: Ia4ce45ed8679951b24af13109e3e498f51fc3c89
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 31a3eda5ed..eaef3434b3 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2193,9 +2193,9 @@ QString qt_normalizePathSegments(const QString &name, QDirPrivate::PathNormaliza
         return name;
 
     int i = len - 1;
-    QVarLengthArray<ushort> outVector(len);
+    QVarLengthArray<char16_t> outVector(len);
     int used = len;
-    ushort *out = outVector.data();
+    char16_t *out = outVector.data();
     const ushort *p = name.utf16();
     const ushort *prefix = p;
     int up = 0;