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

Use one common repeatCount() function in QLocale and QDateTimeParser

Browse Source 
Change-Id: I4b6554966c4eb2c82f406a17d686982a38610b8c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Ahmad Samir 2023-01-05 17:29:17 +02:00
parent 93047c71e8
commit 10e9687159
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/time/qdatetimeparser.cpp
View File

@ -11,6 +11,7 @@
#include "qset.h" #include "qset.h"
#include "qtimezone.h" #include "qtimezone.h"
#include "qvarlengtharray.h" #include "qvarlengtharray.h"
#include "private/qlocale_p.h"
#include "private/qstringiterator_p.h" #include "private/qstringiterator_p.h"
#include "private/qtenvironmentvariables_p.h" #include "private/qtenvironmentvariables_p.h"
@ -398,14 +399,10 @@ static QString unquote(QStringView str)
static inline int countRepeat(QStringView str, int index, int maxCount) static inline int countRepeat(QStringView str, int index, int maxCount)
{ {
str = str.sliced(index); str = str.sliced(index);
if (maxCount > str.size()) if (maxCount < str.size())
maxCount = str.size(); str = str.first(maxCount);
const QChar ch(str[0]); return qt_repeatCount(str);
int count = 1;
while (count < maxCount && str[count] == ch)
++count;
return count;
} }
static inline void appendSeparator(QStringList *list, QStringView string, static inline void appendSeparator(QStringList *list, QStringView string,