Showing the changes to interface/src/Menu.cpp (1 of 11 files). Show all
Unified · Split
| @@ -863,23 +863,23 @@ void Menu::editPreferences() { · 862 unmodified lines | |||
| 863 | } | 863 | } |
| 864 | 864 | ||
| 865 | void Menu::goToDomain(const QString newDomain) { | 865 | void Menu::goToDomain(const QString newDomain) { |
| 866 | if (NodeList::getInstance()->getDomainInfo().getHostname() != newDomain) { | 866 | if (NodeList::getInstance()->getDomainHandler().getHostname() != newDomain) { |
| 867 | 867 | ||
| 868 | // send a node kill request, indicating to other clients that they should play the "disappeared" effect | 868 | // send a node kill request, indicating to other clients that they should play the "disappeared" effect |
| 869 | Application::getInstance()->getAvatar()->sendKillAvatar(); | 869 | Application::getInstance()->getAvatar()->sendKillAvatar(); |
| 870 | 870 | ||
| 871 | // give our nodeList the new domain-server hostname | 871 | // give our nodeList the new domain-server hostname |
| 872 | NodeList::getInstance()->getDomainInfo().setHostname(newDomain); | 872 | NodeList::getInstance()->getDomainHandler().setHostname(newDomain); |
| 873 | } | 873 | } |
| 874 | } | 874 | } |
| 875 | 875 | ||
| 876 | void Menu::goToDomainDialog() { | 876 | void Menu::goToDomainDialog() { |
| 877 | 877 | ||
| 878 | QString currentDomainHostname = NodeList::getInstance()->getDomainInfo().getHostname(); | 878 | QString currentDomainHostname = NodeList::getInstance()->getDomainHandler().getHostname(); |
| 879 | 879 | ||
| 880 | if (NodeList::getInstance()->getDomainInfo().getPort() != DEFAULT_DOMAIN_SERVER_PORT) { | 880 | if (NodeList::getInstance()->getDomainHandler().getPort() != DEFAULT_DOMAIN_SERVER_PORT) { |
| 881 | // add the port to the currentDomainHostname string if it is custom | 881 | // add the port to the currentDomainHostname string if it is custom |
| 882 | currentDomainHostname.append(QString(":%1").arg(NodeList::getInstance()->getDomainInfo().getPort())); | 882 | currentDomainHostname.append(QString(":%1").arg(NodeList::getInstance()->getDomainHandler().getPort())); |
| 883 | } | 883 | } |
| 884 | 884 | ||
| 885 | QInputDialog domainDialog(Application::getInstance()->getWindow()); | 885 | QInputDialog domainDialog(Application::getInstance()->getWindow()); |
| @@ -1034,7 +1034,7 @@ void Menu::nameLocation() { · 148 unmodified lines | |||
| 1034 | connect(manager, &LocationManager::creationCompleted, this, &Menu::namedLocationCreated); | 1034 | connect(manager, &LocationManager::creationCompleted, this, &Menu::namedLocationCreated); |
| 1035 | NamedLocation* location = new NamedLocation(locationName, | 1035 | NamedLocation* location = new NamedLocation(locationName, |
| 1036 | myAvatar->getPosition(), myAvatar->getOrientation(), | 1036 | myAvatar->getPosition(), myAvatar->getOrientation(), |
| 1037 | NodeList::getInstance()->getDomainInfo().getHostname()); | 1037 | NodeList::getInstance()->getDomainHandler().getHostname()); |
| 1038 | manager->createNamedLocation(location); | 1038 | manager->createNamedLocation(location); |
| 1039 | } | 1039 | } |
| 1040 | } | 1040 | } |