1 files changed, 10 insertions, 17 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index f7adb021b6..2b3c6a07cc 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -349,23 +349,16 @@ public:
 
     QByteArray bcp47Name(char separator = '-') const;
 
-    // ### QByteArray::fromRawData would be more optimal
-    inline QString languageCode() const { return QLocalePrivate::languageToCode(QLocale::Language(m_data->m_language_id)); }
-    inline QString scriptCode() const { return QLocalePrivate::scriptToCode(QLocale::Script(m_data->m_script_id)); }
-    inline QString countryCode() const { return QLocalePrivate::countryToCode(QLocale::Country(m_data->m_country_id)); }
-
-    static QString languageToCode(QLocale::Language language);
-    static QString scriptToCode(QLocale::Script script);
-    static QString countryToCode(QLocale::Country country);
-    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()); }
+    inline QLatin1String languageCode() const { return QLocalePrivate::languageToCode(QLocale::Language(m_data->m_language_id)); }
+    inline QLatin1String scriptCode() const { return QLocalePrivate::scriptToCode(QLocale::Script(m_data->m_script_id)); }
+    inline QLatin1String countryCode() const { return QLocalePrivate::countryToCode(QLocale::Country(m_data->m_country_id)); }
+
+    static QLatin1String languageToCode(QLocale::Language language);
+    static QLatin1String scriptToCode(QLocale::Script script);
+    static QLatin1String countryToCode(QLocale::Country country);
+    static QLocale::Language codeToLanguage(QStringView code) Q_DECL_NOTHROW;
+    static QLocale::Script codeToScript(QStringView code) Q_DECL_NOTHROW;
+    static QLocale::Country codeToCountry(QStringView code) Q_DECL_NOTHROW;
     static void getLangAndCountry(const QString &name, QLocale::Language &lang,
                                   QLocale::Script &script, QLocale::Country &cntry);