1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing number/setNum() overloads

Browse Source 
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>
This commit is contained in:
Lars Knoll 2020-05-28 16:29:30 +02:00
parent 7172b5112e
commit 66d6943478
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/text/qbytearray.cpp
View File

@ -4087,6 +4087,20 @@ QByteArray QByteArray::toBase64(Base64Options options) const
\sa toUInt() \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) \fn QByteArray &QByteArray::setNum(short n, int base)
\overload \overload
@ -4264,6 +4278,30 @@ QByteArray QByteArray::number(uint n, int base)
return s; 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 \overload

8
src/corelib/text/qbytearray.h
View File

@ -353,6 +353,8 @@ public:
inline QByteArray &setNum(ushort, int base = 10); inline QByteArray &setNum(ushort, int base = 10);
inline QByteArray &setNum(int, int base = 10); inline QByteArray &setNum(int, int base = 10);
inline QByteArray &setNum(uint, 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(qlonglong, int base = 10);
QByteArray &setNum(qulonglong, int base = 10); QByteArray &setNum(qulonglong, int base = 10);
inline QByteArray &setNum(float, char f = 'g', int prec = 6); 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(int, int base = 10);
Q_REQUIRED_RESULT static QByteArray number(uint, 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(qlonglong, int base = 10);
Q_REQUIRED_RESULT static QByteArray number(qulonglong, 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); 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); } { return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(uint(n)), base); }
inline QByteArray &QByteArray::setNum(uint n, int base) inline QByteArray &QByteArray::setNum(uint n, int base)
{ return setNum(qulonglong(n), 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) inline QByteArray &QByteArray::setNum(float n, char f, int prec)
{ return setNum(double(n),f,prec); } { return setNum(double(n),f,prec); }