Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Base/URL.h
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Base/URL.h')
-rw-r--r--Swiften/Base/URL.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Base/URL.h b/Swiften/Base/URL.h
index 1a03efe..8fdb018 100644
--- a/Swiften/Base/URL.h
+++ b/Swiften/Base/URL.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2011-2016 Isode Limited. 2 * Copyright (c) 2011-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -21,7 +21,7 @@ class SWIFTEN_API URL {
21 URL() : scheme(""), user(""), password(""), host(""), path(""), empty(true) { 21 URL() : scheme(""), user(""), password(""), host(""), path(""), empty(true) {
22 } 22 }
23 23
24 URL(const std::string& scheme, const std::string& host, int port, const std::string& path) : scheme(scheme), user(), password(), host(host), port(port), path(path), empty(false) { 24 URL(const std::string& scheme, const std::string& host, unsigned short port, const std::string& path) : scheme(scheme), user(), password(), host(host), port(port), path(path), empty(false) {
25 } 25 }
26 26
27 URL(const std::string& scheme, const std::string& host, const std::string& path) : scheme(scheme), user(), password(), host(host), path(path), empty(false) { 27 URL(const std::string& scheme, const std::string& host, const std::string& path) : scheme(scheme), user(), password(), host(host), path(path), empty(false) {
@@ -51,7 +51,7 @@ class SWIFTEN_API URL {
51 /** 51 /**
52 * Port number 52 * Port number
53 */ 53 */
54 boost::optional<int> getPort() const { 54 boost::optional<unsigned short> getPort() const {
55 return port; 55 return port;
56 } 56 }
57 57
@@ -64,7 +64,7 @@ class SWIFTEN_API URL {
64 64
65 std::string toString() const; 65 std::string toString() const;
66 66
67 static int getPortOrDefaultPort(const URL& url); 67 static unsigned short getPortOrDefaultPort(const URL& url);
68 static URL fromString(const std::string&); 68 static URL fromString(const std::string&);
69 static std::string unescape(const std::string&); 69 static std::string unescape(const std::string&);
70 70
@@ -74,7 +74,7 @@ class SWIFTEN_API URL {
74 std::string user; 74 std::string user;
75 std::string password; 75 std::string password;
76 std::string host; 76 std::string host;
77 boost::optional<int> port; 77 boost::optional<unsigned short> port;
78 std::string path; 78 std::string path;
79 bool empty; 79 bool empty;
80 }; 80 };