diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-03-30 18:25:32 +0300 |
---|---|---|
committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-03-31 13:30:54 +0000 |
commit | 80d1e732d813c6101d1e7462b5685bd895807084 (patch) | |
tree | 9c9ba87d19379d11fae76ea022574eec815bc38b /src/corelib/tools/qlocale.cpp | |
parent | 342290888f40a6f3317c0eaef07c20a71ac0eeb1 (diff) |
QLocalePrivate: overload codeToCountry() for QStringRef and QChar array
Now we can use QStringRef arg or QChar array arg to avoid
unnecessary allocations.
Also mark these functions as Q_DECL_NOTHROW.
Change-Id: I22b08a054051e80e3f76bb543d860f3dcb6caa4f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
-rw-r--r-- | src/corelib/tools/qlocale.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index ca70d89a83..8d64e02814 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -154,9 +154,8 @@ QLocale::Script QLocalePrivate::codeToScript(const QString &code) return QLocale::AnyScript; } -QLocale::Country QLocalePrivate::codeToCountry(const QString &code) +QLocale::Country QLocalePrivate::codeToCountry(const QChar *code, int len) Q_DECL_NOTHROW { - int len = code.length(); if (len != 2 && len != 3) return QLocale::AnyCountry; ushort uc1 = code[0].toUpper().unicode(); |