Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Rename CUrlParser domain variable

Browse source
This commit is contained in:
Nimetu 2016-05-14 12:53:09 +03:00
parent d888e502b5
commit ec64ba53a7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/gui/url_parser.h
View file

@ -51,7 +51,7 @@ namespace NLGUI
public: public:
std::string scheme; std::string scheme;
std::string domain; std::string authority;
std::string path; std::string path;
std::string query; std::string query;
std::string hash; std::string hash;

16
code/nel/src/gui/url_parser.cpp
View file

@ -63,11 +63,11 @@ namespace NLGUI
} }
} }
// scan for domain // scan for authority
if (uri.substr(0, 2) == "//") if (uri.substr(0, 2) == "//")
{ {
pos = uri.find("/", 3); pos = uri.find("/", 3);
domain = uri.substr(0, pos); authority = uri.substr(0, pos);
if (pos != npos) if (pos != npos)
uri = uri.substr(pos); uri = uri.substr(pos);
else else
@ -99,11 +99,11 @@ namespace NLGUI
scheme = base.scheme; scheme = base.scheme;
// if we already have domain, then ignore base path // if we already have authority, then ignore base path
if (!domain.empty()) if (!authority.empty())
return; return;
domain = base.domain; authority = base.authority;
if (path.empty()) if (path.empty())
{ {
path = base.path; path = base.path;
@ -190,7 +190,7 @@ namespace NLGUI
bool CUrlParser::isAbsolute() const bool CUrlParser::isAbsolute() const
{ {
return !scheme.empty() && !domain.empty(); return !scheme.empty() && !authority.empty();
} }
// serialize URL back to string // serialize URL back to string
@ -200,9 +200,9 @@ namespace NLGUI
if (!scheme.empty()) if (!scheme.empty())
result += scheme + ":"; result += scheme + ":";
if (!domain.empty()) if (!authority.empty())
{ {
result += domain; result += authority;
} }
// path already has leading slash // path already has leading slash