summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Brooks <john.brooks@dereferenced.net>2014-08-29 01:03:49 -0600
committerJohn Brooks <john.brooks@dereferenced.net>2014-09-05 22:59:12 +0200
commit61b47cd16693096072c1270bc5c7ee62873c0425 (patch)
tree4faa4dfa4400c092696fe58f3fa0d5272d4de747 /src
parent983dde1f2f3db76ab26e949d8c2f4f8b968b36be (diff)
Correct QString::toStdString documentation on encoding
This statement was left from when toAscii was used, instead of toUtf8. There is no loss of information when converting to UTF-8. Change-Id: Iad92977af319b324cbf06f1a24712b31a7836622 Reviewed-by: Louai Al-Khanji <louai.al-khanji@digia.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qstring.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 6c8db11212..3b18d31547 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -1306,9 +1306,6 @@ const QString::Null QString::null = { };
Returns a copy of the \a str string. The given string is converted
to Unicode using the fromUtf8() function.
- This constructor is only available if Qt is configured with STL
- compatibility enabled.
-
\sa fromLatin1(), fromLocal8Bit(), fromUtf8()
*/
@@ -1341,7 +1338,7 @@ const QString::Null QString::null = { };
wchar_t is 2 bytes wide (e.g. windows) and in ucs4 on platforms
where wchar_t is 4 bytes wide (most Unix systems).
- This operator is mostly useful to pass a QString to a function
+ This method is mostly useful to pass a QString to a function
that accepts a std::wstring object.
\sa utf16(), toLatin1(), toUtf8(), toLocal8Bit()
@@ -7720,12 +7717,9 @@ bool QString::isRightToLeft() const
QString. The Unicode data is converted into 8-bit characters using
the toUtf8() function.
- This operator is mostly useful to pass a QString to a function
+ This method is mostly useful to pass a QString to a function
that accepts a std::string object.
- If the QString contains non-Latin1 Unicode characters, using this
- can lead to loss of information.
-
\sa toLatin1(), toUtf8(), toLocal8Bit()
*/