diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-27 22:39:45 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-28 22:00:21 +0100 |
| commit | 096e8b5f65c1cb5c5c0a14d46fcb232471401645 (patch) | |
| tree | f0feae9596dbff4a29ca13319a93edb16b88b9b0 /src | |
| parent | d13ee2dc1a151ec7918ac900cf17a76978dd28f1 (diff) | |
QLocale: replace a QList with QVLA for duplicate tracking
An alternative would have been QDuplicateTracker, but the maximum
number of entries in the tracker is statically limited to six, so we
don't need a fancy hash table, linear scan is good enough.
Pick-to: 6.3
Change-Id: I8ca97d239723b51892cb13a43b1d1a6412faa561
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 26087ffd83..dbfdbceac5 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -65,6 +65,7 @@ QT_WARNING_DISABLE_GCC("-Wfree-nonheap-object") // false positive tracking #include "qdatetime.h" #include "qstringlist.h" #include "qvariant.h" +#include "qvarlengtharray.h" #include "qstringbuilder.h" #include "private/qnumeric_p.h" #include <cmath> @@ -502,7 +503,7 @@ int QLocaleData::findLocaleIndex(QLocaleId lid) int index = findLocaleIndexById(likelyId); if (index >= 0) return index; - QList<QLocaleId> tried; + QVarLengthArray<QLocaleId, 6> tried; tried.push_back(likelyId); #define CheckCandidate(id) do { \ |