summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-22 15:15:24 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-14 00:05:49 +0200
commit4618bc3ea0c84762683d99b07c5e56792d2bb0e7 (patch)
treef668da28bbfce3b2aad281396998dbe2c214734b /src/corelib/io
parent23347033ead8ac05a348bd94c409d7cf51e26caa (diff)
Fix QUrl documentation: FullyDecoded and DecodedMode are a pair
DecodedMode with FullyEncoded makes no sense whatsoever. Change-Id: I182db7aceb38e4e9398138066022912adec9c413 Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qurl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 393ac8d00a..e4fb18e2f0 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -1771,7 +1771,7 @@ QString QUrl::userInfo(ComponentFormattingOptions options) const
QUrl::DecodedMode should be used when setting the user name from a data
source which is not a URL, such as a password dialog shown to the user or
- with a user name obtained by calling userName() with the QUrl::FullyEncoded
+ with a user name obtained by calling userName() with the QUrl::FullyDecoded
formatting option.
\sa userName(), setUserInfo()
@@ -1833,7 +1833,7 @@ QString QUrl::userName(ComponentFormattingOptions options) const
QUrl::DecodedMode should be used when setting the password from a data
source which is not a URL, such as a password dialog shown to the user or
- with a password obtained by calling password() with the QUrl::FullyEncoded
+ with a password obtained by calling password() with the QUrl::FullyDecoded
formatting option.
\sa password(), setUserInfo()
@@ -2016,7 +2016,7 @@ int QUrl::port(int defaultPort) const
QUrl::DecodedMode should be used when setting the path from a data source
which is not a URL, such as a dialog shown to the user or with a path
- obtained by calling path() with the QUrl::FullyEncoded formatting option.
+ obtained by calling path() with the QUrl::FullyDecoded formatting option.
\sa path()
*/
@@ -2196,7 +2196,7 @@ QString QUrl::query(ComponentFormattingOptions options) const
QUrl::DecodedMode should be used when setting the fragment from a data
source which is not a URL or with a fragment obtained by calling
- fragment() with the QUrl::FullyEncoded formatting option.
+ fragment() with the QUrl::FullyDecoded formatting option.
\sa fragment(), hasFragment()
*/