diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-03-31 13:54:30 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-03-31 13:31:04 +0000 |
| commit | 32006535461d05d48bb8c63d27ed7e08215d7165 (patch) | |
| tree | f3e143104e200304574e1015df84a656b078f356 /src/corelib/tools/qlocale_p.h | |
| parent | 80d1e732d813c6101d1e7462b5685bd895807084 (diff) | |
QLocalePrivate: add overloaded codeToScript() and codeToLanguage()
... 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: Ibe75346d80cc413e303fad886ecb82dbdb89af24
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index edffcea3e5..f95edf4d14 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -353,8 +353,12 @@ public: static QString languageToCode(QLocale::Language language); static QString scriptToCode(QLocale::Script script); static QString countryToCode(QLocale::Country country); - static QLocale::Language codeToLanguage(const QString &code); - static QLocale::Script codeToScript(const QString &code); + static QLocale::Language codeToLanguage(const QChar *code, int len) Q_DECL_NOTHROW; + static QLocale::Language codeToLanguage(const QString &code) Q_DECL_NOTHROW { return codeToLanguage(code.data(), code.size()); } + static QLocale::Language codeToLanguage(const QStringRef &code) Q_DECL_NOTHROW { return codeToLanguage(code.data(), code.size()); } + static QLocale::Script codeToScript(const QChar *code, int len) Q_DECL_NOTHROW; + static QLocale::Script codeToScript(const QString &code) Q_DECL_NOTHROW { return codeToScript(code.data(), code.size()); } + static QLocale::Script codeToScript(const QStringRef &code) Q_DECL_NOTHROW { return codeToScript(code.data(), code.size()); } static QLocale::Country codeToCountry(const QChar *code, int len) Q_DECL_NOTHROW; static QLocale::Country codeToCountry(const QString &code) Q_DECL_NOTHROW { return codeToCountry(code.data(), code.size()); } static QLocale::Country codeToCountry(const QStringRef &code) Q_DECL_NOTHROW { return codeToCountry(code.data(), code.size()); } |