From 6c588c52dacd5000f80a94b84b9cc979410b1427 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 18 Jul 2011 15:02:45 +0200 Subject: Doc: Moved general notes about character conversion. Task-number: QTBUG-20411 (cherry picked from commit b3922d06680c04324cecd0e0219d02c52b8cf7fd) Change-Id: If2730fa0d8abd6a14070bc19c8c307dbb61ca111 Reviewed-on: http://codereview.qt-project.org/1985 Reviewed-by: Qt Sanity Bot Reviewed-by: Toby Tomkins Reviewed-by: Peter Yard --- src/corelib/io/qurl.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 8e3c98c739..6dca036e05 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -106,6 +106,19 @@ folding rules in QUrl conform to \l{RFC 3491} (Nameprep: A Stringprep Profile for Internationalized Domain Names (IDN)). + \section2 Character Conversions + + Follow these rules to avoid erroneous character conversion when + dealing with URLs and strings: + + \list + \o When creating an QString to contain a URL from a QByteArray or a + char*, always use QString::fromUtf8(). + \o Favor the use of QUrl::fromEncoded() and QUrl::toEncoded() instead of + QUrl(string) and QUrl::toString() when converting a QUrl to or from + a string. + \endlist + \sa QUrlInfo */ @@ -6330,16 +6343,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \o hostname becomes http://hostname \o /home/user/test.html becomes file:///home/user/test.html \endlist - - \section2 Tips to avoid erroneous character conversion when dealing with - URLs and strings: - - \list - \o When creating an URL QString from a QByteArray or a char*, always use - QString::fromUtf8(). - \o Favor the use of QUrl::fromEncoded() and QUrl::toEncoded() instead of - QUrl(string) and QUrl::toString() when converting QUrl to/from string. - \endlist */ QUrl QUrl::fromUserInput(const QString &userInput) { -- cgit v1.2.3