diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-05-28 15:41:52 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-05-30 03:57:32 +0000 |
| commit | b9dc4f7a961ef8526597e92b5ce413fc310240f2 (patch) | |
| tree | 0e915c90d693c94228b0e0326b97f5077c6487db /src | |
| parent | 9ffb00130624b90dabab9cf5dd6cb53999b32bdd (diff) | |
Suppress warnings about deprecated QString constructor
They were introduced in commit c416a7f25770563a265cc86e779f2e54c01a85a0.
warning: ‘QString::QString(const QByteArray&)’ is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations]
Change-Id: I6a540578e810472bb455fffd1532e31736e1edc9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qlocale_unix.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp index 1a9184bca9..f202082213 100644 --- a/src/corelib/tools/qlocale_unix.cpp +++ b/src/corelib/tools/qlocale_unix.cpp @@ -107,7 +107,7 @@ Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData) #ifndef QT_NO_SYSTEMLOCALE -static bool contradicts(const QByteArray &maybe, const QByteArray &known) +static bool contradicts(const QString &maybe, const QString &known) { if (maybe.isEmpty()) return false; @@ -137,25 +137,25 @@ static bool contradicts(const QByteArray &maybe, const QByteArray &known) QLocale QSystemLocale::fallbackUiLocale() const { // See man 7 locale for precedence - LC_ALL beats LC_MESSAGES beats LANG: - QByteArray lang = qgetenv("LC_ALL"); + QString lang = qEnvironmentVariable("LC_ALL"); if (lang.isEmpty()) - lang = qgetenv("LC_MESSAGES"); + lang = qEnvironmentVariable("LC_MESSAGES"); if (lang.isEmpty()) - lang = qgetenv("LANG"); + lang = qEnvironmentVariable("LANG"); // if the locale is the "C" locale, then we can return the language we found here: - if (lang.isEmpty() || lang == QByteArray("C") || lang == QByteArray("POSIX")) - return QLocale(QString::fromLatin1(lang)); + if (lang.isEmpty() || lang == QLatin1String("C") || lang == QLatin1String("POSIX")) + return QLocale(lang); // ... otherwise, if the first part of LANGUAGE says more than or // contradicts what we have, use that: - QByteArray language = qgetenv("LANGUAGE"); + QString language = qEnvironmentVariable("LANGUAGE"); if (!language.isEmpty()) { - language = language.split(':').constFirst(); + language = language.split(QLatin1Char(':')).constFirst(); if (contradicts(language, lang)) - return QLocale(QString::fromLatin1(language)); + return QLocale(language); } - return QLocale(QString::fromLatin1(lang)); + return QLocale(lang); } QVariant QSystemLocale::query(QueryType type, QVariant in) const |