diff options
| author | Anton Kudryavtsev <antkudr@mail.ru> | 2017-03-29 07:10:46 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <antkudr@mail.ru> | 2017-03-30 20:31:59 +0000 |
| commit | 5ec57560c0b497f9f48671dd200bb23d1f6eac35 (patch) | |
| tree | 66903177b84d4fc481c8c4e689f47e79aa1a622c /src/corelib/tools/qlocale_win.cpp | |
| parent | ce124d511917f95bd9193ec71f747f490ec982da (diff) | |
Prefer rvalue versions of toLatin() and toUtf8()
... to re-use existing buffers.
Change-Id: I7c42529b8cd4400520a59e658ab76f4f8e965cd4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qlocale_win.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index d1abb8b565..2475859abd 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -1037,7 +1037,7 @@ static QString winIso639LangName(LPWSTR id) if (!lang_code.isEmpty()) { const char *endptr; bool ok; - QByteArray latin1_lang_code = lang_code.toLatin1(); + QByteArray latin1_lang_code = std::move(lang_code).toLatin1(); int i = qstrtoull(latin1_lang_code, &endptr, 16, &ok); if (ok && *endptr == '\0') { switch (i) { @@ -1120,15 +1120,12 @@ static QByteArray getWinLocaleName(LPWSTR id) id = lcName; } #endif // Q_OS_WINRT - QString resultuage = winIso639LangName(id); + QString resultusage = winIso639LangName(id); QString country = winIso3116CtryName(id); - result = resultuage.toLatin1(); - if (!country.isEmpty()) { - result += '_'; - result += country.toLatin1(); - } + if (!country.isEmpty()) + resultusage += QLatin1Char('_') + country; - return result; + return std::move(resultusage).toLatin1(); } Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id) |