From 7aa630b5ccf26f7d95ab61efb70b420e8dae0f46 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 22 Nov 2020 03:19:51 +0000 Subject: [PATCH] remove unused qIsAlnum() function Signed-off-by: Ivailo Monev --- src/core/tools/qlocale_tools.cpp | 6 +++--- src/core/tools/qlocale_tools_p.h | 16 +++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/core/tools/qlocale_tools.cpp b/src/core/tools/qlocale_tools.cpp index 0000b31c5..8f4efe5e2 100644 --- a/src/core/tools/qlocale_tools.cpp +++ b/src/core/tools/qlocale_tools.cpp @@ -53,12 +53,12 @@ QT_BEGIN_NAMESPACE -QString qulltoa(qulonglong l, int base, const QChar _zero) +QString qulltoa(qulonglong l, int base, const QChar zero) { ushort buff[65]; // length of MAX_ULLONG in base 2 ushort *p = buff + 65; - if (base != 10 || _zero.unicode() == '0') { + if (base != 10 || zero.unicode() == '0') { while (l != 0) { int c = l % base; @@ -76,7 +76,7 @@ QString qulltoa(qulonglong l, int base, const QChar _zero) while (l != 0) { int c = l % base; - *(--p) = _zero.unicode() + c; + *(--p) = zero.unicode() + c; l /= base; } diff --git a/src/core/tools/qlocale_tools_p.h b/src/core/tools/qlocale_tools_p.h index f3092c146..9217f39e9 100644 --- a/src/core/tools/qlocale_tools_p.h +++ b/src/core/tools/qlocale_tools_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -QString qulltoa(qulonglong l, int base, const QChar _zero); +QString qulltoa(qulonglong l, int base, const QChar zero); QString qlltoa(qlonglong l, int base, const QChar zero); enum PrecisionMode { @@ -79,25 +79,19 @@ static inline bool qIsZero(double d) static inline bool qIsUpper(char ch) { - return ch >= 'A' && ch <= 'Z'; + return (ch >= 'A' && ch <= 'Z'); } static inline bool qIsDigit(char ch) { - return ch >= '0' && ch <= '9'; + return (ch >= '0' && ch <= '9'); } static inline char qToLower(char ch) { if (ch >= 'A' && ch <= 'Z') - return ch - 'A' + 'a'; - else - return ch; -} - -static inline bool qIsAlnum(char c) -{ - return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); + return (ch - 'A' + 'a'); + return ch; } // Removes thousand-group separators in "C" locale. -- 2.11.0