From 66d6943478c3ae76f996c2cd2fdf04fee4fcb767 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Thu, 28 May 2020 16:29:30 +0200
Subject: [PATCH] Add missing number/setNum() overloads
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QString has the overloads taking a long/ulong. QByteArray also has
toLong/ULong(), so add these to make the API symmetric.

Change-Id: I6d1f98ca95fabd32b012f1c3df603dc54e187ec3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/text/qbytearray.cpp | 38 +++++++++++++++++++++++++++++++++
 src/corelib/text/qbytearray.h   |  8 +++++++
 2 files changed, 46 insertions(+)

diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index b85a46b146..4eb9b5f592 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -4087,6 +4087,20 @@ QByteArray QByteArray::toBase64(Base64Options options) const
     \sa toUInt()
 */
 
+/*!
+    \fn QByteArray &QByteArray::setNum(long n, int base)
+    \overload
+
+    \sa toLong()
+*/
+
+/*!
+    \fn QByteArray &QByteArray::setNum(ulong n, int base)
+    \overload
+
+    \sa toULong()
+*/
+
 /*!
     \fn QByteArray &QByteArray::setNum(short n, int base)
     \overload
@@ -4264,6 +4278,30 @@ QByteArray QByteArray::number(uint n, int base)
     return s;
 }
 
+/*!
+    \overload
+
+    \sa toLong()
+*/
+QByteArray QByteArray::number(long n, int base)
+{
+    QByteArray s;
+    s.setNum(n, base);
+    return s;
+}
+
+/*!
+    \overload
+
+    \sa toULong()
+*/
+QByteArray QByteArray::number(ulong n, int base)
+{
+    QByteArray s;
+    s.setNum(n, base);
+    return s;
+}
+
 /*!
     \overload
 
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
index bc4b0b3763..265ad9c642 100644
--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -353,6 +353,8 @@ public:
     inline QByteArray &setNum(ushort, int base = 10);
     inline QByteArray &setNum(int, int base = 10);
     inline QByteArray &setNum(uint, int base = 10);
+    inline QByteArray &setNum(long, int base = 10);
+    inline QByteArray &setNum(ulong, int base = 10);
     QByteArray &setNum(qlonglong, int base = 10);
     QByteArray &setNum(qulonglong, int base = 10);
     inline QByteArray &setNum(float, char f = 'g', int prec = 6);
@@ -361,6 +363,8 @@ public:
 
     Q_REQUIRED_RESULT static QByteArray number(int, int base = 10);
     Q_REQUIRED_RESULT static QByteArray number(uint, int base = 10);
+    Q_REQUIRED_RESULT static QByteArray number(long, int base = 10);
+    Q_REQUIRED_RESULT static QByteArray number(ulong, int base = 10);
     Q_REQUIRED_RESULT static QByteArray number(qlonglong, int base = 10);
     Q_REQUIRED_RESULT static QByteArray number(qulonglong, int base = 10);
     Q_REQUIRED_RESULT static QByteArray number(double, char f = 'g', int prec = 6);
@@ -629,6 +633,10 @@ inline QByteArray &QByteArray::setNum(int n, int base)
 { return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(uint(n)), base); }
 inline QByteArray &QByteArray::setNum(uint n, int base)
 { return setNum(qulonglong(n), base); }
+inline QByteArray &QByteArray::setNum(long n, int base)
+{ return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(ulong(n)), base); }
+inline QByteArray &QByteArray::setNum(ulong n, int base)
+{ return setNum(qulonglong(n), base); }
 inline QByteArray &QByteArray::setNum(float n, char f, int prec)
 { return setNum(double(n),f,prec); }