Showing the changes to interface/src/scripting/GlobalServicesScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -53,31 +53,13 @@ void GlobalServicesScriptingInterface::loggedOut() { · 52 unmodified lines | ||
| 53 | 53 | emit GlobalServicesScriptingInterface::disconnected(QString("logout")); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | − | |
| 57 | −QString GlobalServicesScriptingInterface::findableByString(Discoverability::Mode discoverabilityMode) const { | |
| 58 | − if (discoverabilityMode == Discoverability::None) { | |
| 59 | − return "none"; | |
| 60 | − } else if (discoverabilityMode == Discoverability::Friends) { | |
| 61 | − return "friends"; | |
| 62 | − } else if (discoverabilityMode == Discoverability::Connections) { | |
| 63 | − return "connections"; | |
| 64 | − } else if (discoverabilityMode == Discoverability::All) { | |
| 65 | − return "all"; | |
| 66 | − } else { | |
| 67 | − qDebug() << "GlobalServices findableByString called with an unrecognized value."; | |
| 68 | − return ""; | |
| 69 | − } | |
| 70 | −} | |
| 71 | − | |
| 72 | − | |
| 73 | 56 | QString GlobalServicesScriptingInterface::getFindableBy() const { |
| 74 | 57 | auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); |
| 75 | − return findableByString(discoverabilityManager->getDiscoverabilityMode()); | |
| 58 | + return DiscoverabilityManager::findableByString(discoverabilityManager->getDiscoverabilityMode()); | |
| 76 | 59 | } |
| 77 | 60 | |
| 78 | 61 | void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabilityMode) { |
| 79 | 62 | auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>(); |
| 80 | − | |
| 81 | 63 | if (discoverabilityMode.toLower() == "none") { |
| 82 | 64 | discoverabilityManager->setDiscoverabilityMode(Discoverability::None); |
| 83 | 65 | } else if (discoverabilityMode.toLower() == "friends") { |
| @@ -92,7 +74,7 @@ void GlobalServicesScriptingInterface::setFindableBy(const QString& discoverabil · 8 unmodified lines | ||
| 92 | 74 | } |
| 93 | 75 | |
| 94 | 76 | void GlobalServicesScriptingInterface::discoverabilityModeChanged(Discoverability::Mode discoverabilityMode) { |
| 95 | − emit findableByChanged(findableByString(discoverabilityMode)); | |
| 77 | + emit findableByChanged(DiscoverabilityManager::findableByString(discoverabilityMode)); | |
| 96 | 78 | } |
| 97 | 79 | |
| 98 | 80 | DownloadInfoResult::DownloadInfoResult() : |