Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -4004,7 +4004,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 4003 unmodified lines | |||
| 4004 | parser.parse(arguments()); | 4004 | parser.parse(arguments()); |
| 4005 | if (parser.isSet(urlOption)) { | 4005 | if (parser.isSet(urlOption)) { |
| 4006 | QUrl url = QUrl(parser.value(urlOption)); | 4006 | QUrl url = QUrl(parser.value(urlOption)); |
| 4007 | if (url.scheme() == URL_SCHEME_HIFIAPP) { | 4007 | if (url.scheme() == URL_SCHEME_VIRCADIAAPP) { |
| 4008 | Setting::Handle<QVariant>("startUpApp").set(url.path()); | 4008 | Setting::Handle<QVariant>("startUpApp").set(url.path()); |
| 4009 | } else { | 4009 | } else { |
| 4010 | addressLookupString = url.toString(); | 4010 | addressLookupString = url.toString(); |
| @@ -7285,7 +7285,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) { · 3274 unmodified lines | |||
| 7285 | 7285 | ||
| 7286 | void Application::domainURLChanged(QUrl domainURL) { | 7286 | void Application::domainURLChanged(QUrl domainURL) { |
| 7287 | // disable physics until we have enough information about our new location to not cause craziness. | 7287 | // disable physics until we have enough information about our new location to not cause craziness. |
| 7288 | setIsServerlessMode(domainURL.scheme() != URL_SCHEME_HIFI); | 7288 | setIsServerlessMode(domainURL.scheme() != URL_SCHEME_VIRCADIA); |
| 7289 | if (isServerlessMode()) { | 7289 | if (isServerlessMode()) { |
| 7290 | loadServerlessDomain(domainURL); | 7290 | loadServerlessDomain(domainURL); |
| 7291 | } | 7291 | } |
| @@ -7294,7 +7294,7 @@ void Application::domainURLChanged(QUrl domainURL) { · 2 unmodified lines | |||
| 7294 | 7294 | ||
| 7295 | void Application::goToErrorDomainURL(QUrl errorDomainURL) { | 7295 | void Application::goToErrorDomainURL(QUrl errorDomainURL) { |
| 7296 | // disable physics until we have enough information about our new location to not cause craziness. | 7296 | // disable physics until we have enough information about our new location to not cause craziness. |
| 7297 | setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_HIFI); | 7297 | setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_VIRCADIA); |
| 7298 | if (isServerlessMode()) { | 7298 | if (isServerlessMode()) { |
| 7299 | loadErrorDomain(errorDomainURL); | 7299 | loadErrorDomain(errorDomainURL); |
| 7300 | } | 7300 | } |
| @@ -7658,7 +7658,7 @@ bool Application::canAcceptURL(const QString& urlString) const { · 357 unmodified lines | |||
| 7658 | QUrl url(urlString); | 7658 | QUrl url(urlString); |
| 7659 | if (url.query().contains(WEB_VIEW_TAG)) { | 7659 | if (url.query().contains(WEB_VIEW_TAG)) { |
| 7660 | return false; | 7660 | return false; |
| 7661 | } else if (urlString.startsWith(URL_SCHEME_HIFI)) { | 7661 | } else if (urlString.startsWith(URL_SCHEME_VIRCADIA)) { |
| 7662 | return true; | 7662 | return true; |
| 7663 | } | 7663 | } |
| 7664 | QString lowerPath = url.path().toLower(); | 7664 | QString lowerPath = url.path().toLower(); |
| @@ -7673,7 +7673,7 @@ bool Application::canAcceptURL(const QString& urlString) const { · 8 unmodified lines | |||
| 7673 | bool Application::acceptURL(const QString& urlString, bool defaultUpload) { | 7673 | bool Application::acceptURL(const QString& urlString, bool defaultUpload) { |
| 7674 | QUrl url(urlString); | 7674 | QUrl url(urlString); |
| 7675 | 7675 | ||
| 7676 | if (url.scheme() == URL_SCHEME_HIFI) { | 7676 | if (url.scheme() == URL_SCHEME_VIRCADIA) { |
| 7677 | // this is a hifi URL - have the AddressManager handle it | 7677 | // this is a hifi URL - have the AddressManager handle it |
| 7678 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", | 7678 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", |
| 7679 | Qt::AutoConnection, Q_ARG(const QString&, urlString)); | 7679 | Qt::AutoConnection, Q_ARG(const QString&, urlString)); |