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