History

updates for new DependencyManager API

Stephen Birarda committed 11 years ago

Commit 9f21b411 parent 7beb3a713 files · +60 −57Browse files

Showing the changes to interface/src/scripting/LocationScriptingInterface.cpp (1 of 13 files). Show all

Unified · Split

interface/src/scripting/LocationScriptingInterface.cpp+3−3
@@ -19,7 +19,7 @@ LocationScriptingInterface* LocationScriptingInterface::getInstance() { · 18 unmodified lines
1919 }
2020
2121 QScriptValue LocationScriptingInterface::locationGetter(QScriptContext* context, QScriptEngine* engine) {
22− return engine->newQObject(DependencyManager::get<AddressManager>());
22+ return engine->newQObject(DependencyManager::get<AddressManager>().data());
2323 }
2424
2525 QScriptValue LocationScriptingInterface::locationSetter(QScriptContext* context, QScriptEngine* engine) {
@@ -28,11 +28,11 @@ QScriptValue LocationScriptingInterface::locationSetter(QScriptContext* context, · 2 unmodified lines
2828
2929 if (argumentVariant.canConvert(QMetaType::QVariantMap)) {
3030 // this argument is a variant map, so we'll assume it's an address map
31− QMetaObject::invokeMethod(DependencyManager::get<AddressManager>(), "goToAddressFromObject",
31+ QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "goToAddressFromObject",
3232 Q_ARG(const QVariantMap&, argumentVariant.toMap()));
3333 } else {
3434 // just try and convert the argument to a string, should be a hifi:// address
35− QMetaObject::invokeMethod(DependencyManager::get<AddressManager>(), "handleLookupString",
35+ QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
3636 Q_ARG(const QString&, argumentVariant.toString()));
3737 }
3838