From 429985b53aeb930ec3fdd14ccb429992a3539629 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 13 Aug 2020 15:30:59 +0200
Subject: Convert QStringView::toWCharArray() to return qsizetype

As requested in a ### Qt6 comment.

Task-number: QTBUG-85700
Change-Id: I28a02bf49f4a6455a21a6032179318ce2915b8ca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/text/qstring.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/corelib/text/qstring.h')

diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index a8a1211ff5..04a333aefa 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1079,14 +1079,14 @@ inline qsizetype QString::toWCharArray(wchar_t *array) const
     return qToStringViewIgnoringNull(*this).toWCharArray(array);
 }
 
-int QStringView::toWCharArray(wchar_t *array) const
+qsizetype QStringView::toWCharArray(wchar_t *array) const
 {
     if (sizeof(wchar_t) == sizeof(QChar)) {
         if (auto src = data())
             memcpy(array, src, sizeof(QChar) * size());
-        return int(size());     // ### q6sizetype
+        return size();
     } else {
-        return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), int(size()),
+        return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), size(),
                                       reinterpret_cast<uint *>(array));
     }
 }
-- 
cgit v1.2.3