Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 19:15:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12819 from Atlante45/fix/location-hostname

Browse source 
Fix location.hostname
This commit is contained in:
John Conklin II 2018-04-09 09:42:41 -07:00 committed by GitHub
commit d281d7b2cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/AddressManager.cpp
View file

@ -768,14 +768,6 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16
return false; return false;
} }
QString AddressManager::getHost() const {
if (isPossiblePlaceName(_domainURL.host())) {
return QString();
}
return _domainURL.host();
}
bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger) { bool AddressManager::setDomainInfo(const QUrl& domainURL, LookupTrigger trigger) {
const QString hostname = domainURL.host(); const QString hostname = domainURL.host();
quint16 port = domainURL.port(); quint16 port = domainURL.port();

2
libraries/networking/src/AddressManager.h
View file

@ -160,7 +160,7 @@ public:
QString getPlaceName() const; QString getPlaceName() const;
QString getDomainID() const; QString getDomainID() const;
QString getHost() const; QString getHost() const { return _domainURL.host(); }
void setPositionGetter(PositionGetter positionGetter) { _positionGetter = positionGetter; } void setPositionGetter(PositionGetter positionGetter) { _positionGetter = positionGetter; }
void setOrientationGetter(OrientationGetter orientationGetter) { _orientationGetter = orientationGetter; } void setOrientationGetter(OrientationGetter orientationGetter) { _orientationGetter = orientationGetter; }