QVersionNumber: change int to qsizetype in fromString()

This completes the update to qsizetype in this class, adding a couple of
methods that need to be removed in Qt 7. They're only required where int
is not qsizetype (i.e., 64-bit platforms).

Change-Id: I0e5f6bec596a4a78bd3bfffd16c9de29bec4c637
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

2 files changed, 13 insertions, 7 deletions

diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 54524c4405..d30608534f 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -413,7 +413,7 @@ QString QVersionNumber::toString() const
 
     \sa isNull()
 */
-QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixIndex)
+QVersionNumber QVersionNumber::fromString(const QString &string, qsizetype *suffixIndex)
 {
     return fromString(QLatin1String(string.toLatin1()), suffixIndex);
 }
@@ -434,7 +434,7 @@ QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixInde
 
     \sa isNull()
 */
-QVersionNumber QVersionNumber::fromString(QStringView string, int *suffixIndex)
+QVersionNumber QVersionNumber::fromString(QStringView string, qsizetype *suffixIndex)
 {
     return fromString(QLatin1String(string.toLatin1()), suffixIndex);
 }
@@ -454,7 +454,7 @@ QVersionNumber QVersionNumber::fromString(QStringView string, int *suffixIndex)
 
     \sa isNull()
 */
-QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)
+QVersionNumber QVersionNumber::fromString(QLatin1String string, qsizetype *suffixIndex)
 {
     QList<int> seg;
 
@@ -474,7 +474,7 @@ QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex
     } while (start < endOfString && (end < endOfString && *end == '.'));
 
     if (suffixIndex)
-        *suffixIndex = int(lastGoodEnd - string.begin());
+        *suffixIndex = lastGoodEnd - string.begin();
 
     return QVersionNumber(std::move(seg));
 }
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index 9d6c7d3018..175abe4e61 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -276,10 +276,16 @@ public:
 
     [[nodiscard]] Q_CORE_EXPORT QString toString() const;
 #if QT_STRINGVIEW_LEVEL < 2
-    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(const QString &string, int *suffixIndex = nullptr);
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(const QString &string, qsizetype *suffixIndex = nullptr);
+#endif
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QLatin1String string, qsizetype *suffixIndex = nullptr);
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QStringView string, qsizetype *suffixIndex = nullptr);
+
+#if QT_REMOVED_SINCE(6, 4) && QT_POINTER_SIZE != 4
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(const QString &string, int *suffixIndex);
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QLatin1String string, int *suffixIndex);
+    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QStringView string, int *suffixIndex);
 #endif
-    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QLatin1String string, int *suffixIndex = nullptr);
-    [[nodiscard]] Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(QStringView string, int *suffixIndex = nullptr);
 
     [[nodiscard]] friend bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
     { return compare(lhs, rhs) > 0; }