summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qchar.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-02 12:55:49 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-03 11:33:05 +0200
commit9c75a547a0eddd8913ec5f1a49b5ba5749f50973 (patch)
tree285dbfad626d3614b2757fe32fa03ca56ed04f91 /src/corelib/tools/qchar.cpp
parentd9f4b130aa1c529c50d1e7a9d55c13de7ea72b08 (diff)
Remove references to to/fromAscii in QString and QByteArray main docs
Those functions are about to be deprecated and shouldn't be referred to in the main documentation. Since they were temporarily changed to mean UTF-8, this is not a behaviour change. The next commit will update the code to match the documentation. Change-Id: Ia8c2843c7f2b478f5691fe0224d5e631d94b1af6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qchar.cpp')
-rw-r--r--src/corelib/tools/qchar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index b83170cb46..89017fee58 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -151,9 +151,9 @@ QT_BEGIN_NAMESPACE
to convert to and from traditional 8-bit \c{char}s. If you
defined \c QT_NO_CAST_FROM_ASCII and \c QT_NO_CAST_TO_ASCII, as
explained in the QString documentation, you will need to
- explicitly call fromAscii() or fromLatin1(), or use QLatin1Char,
+ explicitly call fromLatin1(), or use QLatin1Char,
to construct a QChar from an 8-bit \c char, and you will need to
- call toAscii() or toLatin1() to get the 8-bit value back.
+ call toLatin1() to get the 8-bit value back.
For more information see
\l{http://www.unicode.org/ucd/}{"About the Unicode Character Database"}.
@@ -1251,7 +1251,7 @@ ushort QChar::toCaseFolded(ushort ucs2)
\note It is not possible to distinguish a non-Latin-1 character from a Latin-1 0
(NUL) character. Prefer to use unicode(), which does not have this ambiguity.
- \sa toAscii(), unicode()
+ \sa unicode()
*/
/*!
@@ -1262,7 +1262,7 @@ ushort QChar::toCaseFolded(ushort ucs2)
An alternative is to use QLatin1Char.
- \sa fromAscii(), unicode()
+ \sa toLatin1(), unicode()
*/
/*!