History

rework ScriptValue to act like a stack variable rather than a pointer

Heather Anderson committed 5 years ago

Commit 85810221 parent f209c51170 files · +2837 −2594Browse files

Showing the changes to libraries/script-engine/src/LocationScriptingInterface.cpp (1 of 170 files). Show all

Unified · Split

libraries/script-engine/src/LocationScriptingInterface.cpp+3−3
@@ -21,12 +21,12 @@ LocationScriptingInterface* LocationScriptingInterface::getInstance() { · 20 unmodified lines
21 return &sharedInstance;21 return &sharedInstance;
22}22}
23 23
24ScriptValuePointer LocationScriptingInterface::locationGetter(ScriptContext* context, ScriptEngine* engine) {24ScriptValue LocationScriptingInterface::locationGetter(ScriptContext* context, ScriptEngine* engine) {
25 return engine->newQObject(DependencyManager::get<AddressManager>().data());25 return engine->newQObject(DependencyManager::get<AddressManager>().data());
26}26}
27 27
28ScriptValuePointer LocationScriptingInterface::locationSetter(ScriptContext* context, ScriptEngine* engine) {28ScriptValue LocationScriptingInterface::locationSetter(ScriptContext* context, ScriptEngine* engine) {
29 const QVariant& argumentVariant = context->argument(0)->toVariant();29 const QVariant& argumentVariant = context->argument(0).toVariant();
30 30
31 // just try and convert the argument to a string, should be a hifi:// address31 // just try and convert the argument to a string, should be a hifi:// address
32 QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",32 QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",