diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-21 20:21:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-22 20:56:38 +0200 |
| commit | 1ca791faf5b89c35b4b39d443d2118a882c3946b (patch) | |
| tree | e11be9b68338786b61d12323f58e998211f89121 /src/corelib/io/qurl.h | |
| parent | 53d0624403f7f2ac8fe8364a7c5cd136717d40ed (diff) | |
Add the QUrl::FullyDecoded flag to the component formatting
This allows the QUrl component getters to return fully decoded data,
like they did in Qt 4. This is necessary for some use-cases where the
component like the user name, password or path are used outside the
context of a URL. In those contexts, the percent-encoded data makes no
sense, and the loss of data of what could be represented in a URL is
acceptable.
Also take the opportunity to expand the documentation of those getter
methods, explaining what the options argument does.
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-May/003811.html
Change-Id: I89f743cde78c02f169c88314bff0768714341419
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 41e6c17fd5..90b29ed958 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -145,9 +145,10 @@ public: EncodeDelimiters = 0x400000 | 0x800000, EncodeReserved = 0x1000000, DecodeReserved = 0x2000000, + // 0x4000000 used to indicate full-decode mode FullyEncoded = EncodeSpaces | EncodeUnicode | EncodeDelimiters | EncodeReserved, - MostDecoded = PrettyDecoded | DecodeReserved + FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000 }; Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption) #ifdef qdoc |