diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 13:25:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 01:42:02 +0200 |
| commit | b6e4c859d38674e77fb3b1372cb7751f3cfe1682 (patch) | |
| tree | 0330fb4c702cfaaf537f0492ec77bedbe91600e7 /src/corelib/tools/qstring.cpp | |
| parent | 3f9b5086525ac4552fd4d7cc89c74bf76f45b1dc (diff) | |
Change to/fromAscii to to/fromUtf8 in the QString conversions
This commit matches the previous documentation commit that says that
the conversions are applied using to/fromUtf8.
Change-Id: I304e4d866ddedac5094fef8500cbeba299a02cb5
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index a0963b6db2..c495c18810 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -375,7 +375,7 @@ inline char qToLower(char ch) Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2) { // ### optimize me - return s1 == QString::fromAscii(s2); + return s1 == QString::fromUtf8(s2); } /*! @@ -384,7 +384,7 @@ Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const char *s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray &s2) { // ### optimize me - return s1 == QString::fromAscii(s2); + return s1 == QString::fromUtf8(s2); } /*! @@ -393,7 +393,7 @@ Q_CORE_EXPORT bool qStringComparisonHelper(const QString &s1, const QByteArray & Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2) { // ### optimize me - return s1 == QString::fromAscii(s2); + return s1 == QString::fromUtf8(s2); } /*! @@ -402,7 +402,7 @@ Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const char *s2) Q_CORE_EXPORT bool qStringComparisonHelper(const QStringRef &s1, const QByteArray &s2) { // ### optimize me - return s1 == QString::fromAscii(s2); + return s1 == QString::fromUtf8(s2); } const QString::Null QString::null = { }; |