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

QUrl::idnWhiteList(): add QList::reserve() call

Browse Source 
Avoids reallocation.

Change-Id: I3238574590463596a797d237b066ef60214392a7
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2012-08-04 08:16:47 +02:00 committed by Qt by Nokia
parent 045a5e3b42
commit bfabd0de51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qurlidna.cpp
View File

@ -2358,6 +2358,7 @@ static const char * const idn_whitelist[] = {
"xn--mgberp4a5d4ar", // Saudi Arabia "xn--mgberp4a5d4ar", // Saudi Arabia
"xn--wgbh1c" // Egypt "xn--wgbh1c" // Egypt
}; };
static const size_t idn_whitelist_size = sizeof idn_whitelist / sizeof *idn_whitelist;
static QStringList *user_idn_whitelist = 0; static QStringList *user_idn_whitelist = 0;
@ -2406,7 +2407,7 @@ static bool qt_is_idn_enabled(const QString &domain)
return user_idn_whitelist->contains(tldString); return user_idn_whitelist->contains(tldString);
int l = 0; int l = 0;
int r = sizeof(idn_whitelist)/sizeof(const char *) - 1; int r = idn_whitelist_size - 1;
int i = (l + r + 1) / 2; int i = (l + r + 1) / 2;
while (r != l) { while (r != l) {
@ -2558,8 +2559,9 @@ QStringList QUrl::idnWhitelist()
if (user_idn_whitelist) if (user_idn_whitelist)
return *user_idn_whitelist; return *user_idn_whitelist;
QStringList list; QStringList list;
list.reserve(idn_whitelist_size);
unsigned int i = 0; unsigned int i = 0;
while (i < sizeof(idn_whitelist)/sizeof(const char *)) { while (i < idn_whitelist_size) {
list << QLatin1String(idn_whitelist[i]); list << QLatin1String(idn_whitelist[i]);
++i; ++i;
} }