Showing the changes to interface/src/scripting/LocationScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -25,16 +25,9 @@ QScriptValue LocationScriptingInterface::locationGetter(QScriptContext* context, · 24 unmodified lines | |||
| 25 | QScriptValue LocationScriptingInterface::locationSetter(QScriptContext* context, QScriptEngine* engine) { | 25 | QScriptValue LocationScriptingInterface::locationSetter(QScriptContext* context, QScriptEngine* engine) { |
| 26 | const QVariant& argumentVariant = context->argument(0).toVariant(); | 26 | const QVariant& argumentVariant = context->argument(0).toVariant(); |
| 27 | 27 | ||
| 28 | 28 | // just try and convert the argument to a string, should be a hifi:// address | |
| 29 | if (argumentVariant.canConvert(QMetaType::QVariantMap)) { | 29 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", |
| 30 | // this argument is a variant map, so we'll assume it's an address map | 30 | Q_ARG(const QString&, argumentVariant.toString())); |
| 31 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "goToAddressFromObject", | ||
| 32 | Q_ARG(const QVariantMap&, argumentVariant.toMap())); | ||
| 33 | } else { | ||
| 34 | // just try and convert the argument to a string, should be a hifi:// address | ||
| 35 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", | ||
| 36 | Q_ARG(const QString&, argumentVariant.toString())); | ||
| 37 | } | ||
| 38 | 31 | ||
| 39 | return QScriptValue::UndefinedValue; | 32 | return QScriptValue::UndefinedValue; |
| 40 | } | 33 | } |