summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qurl.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-03-30 13:32:19 -0300
committerQt by Nokia <qt-info@nokia.com>2012-04-11 23:32:04 +0200
commita01c662d3737fd9f26a7e4455d7bcb03628155d7 (patch)
tree464792bd6b68b3590d6275ec7dcaefd3fa9f4d4d /src/corelib/io/qurl.h
parent0441b2d4c332e0ae6e5ca52878985b826e8f68ca (diff)
Introduce QUrl::DecodeReserved and reorder the enums
DecodeReserved applies to all characters between 0x21 and 0x7E that aren't unreserved, a delimiter, or the percent sign itself. Change-Id: Ie64bddb6b814dfa3bb8380e3aa24de1bb3645a65 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
-rw-r--r--src/corelib/io/qurl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 4eaf652ff5..27b81dfc0f 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -140,10 +140,11 @@ public:
enum ComponentFormattingOption {
FullyEncoded = 0x000000,
DecodeSpaces = 0x100000,
- DecodeDelimiters = 0x200000 | 0x400000,
- DecodeUnicode = 0x800000,
+ DecodeUnicode = 0x200000,
+ DecodeDelimiters = 0x400000 | 0x800000,
+ DecodeReserved = 0x1000000,
- PrettyDecoded = DecodeSpaces | DecodeDelimiters | DecodeUnicode,
+ PrettyDecoded = DecodeSpaces | DecodeDelimiters | DecodeReserved | DecodeUnicode,
MostDecoded = PrettyDecoded
};
Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption)