History

convert script engine variables from QSharedPointer to std::shared_ptr

Heather Anderson committed 5 years ago

Commit 70fbe761 parent 82535ca49 files · +194 −164Browse files

Showing the changes to interface/src/Application.cpp (1 of 49 files). Show all

Unified · Split

interface/src/Application.cpp+18−18
@@ -7476,10 +7476,10 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 7475 unmodified lines
74767476
74777477 ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface();
74787478 scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable);
7479− connect(scriptManager.data(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
7479+ connect(scriptManager.get(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
74807480
74817481 scriptEngine->registerGlobalObject("Overlays", &_overlays);
7482− scriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue,
7482+ scriptRegisterMetaType(scriptEngine.get(), RayToOverlayIntersectionResultToScriptValue,
74837483 RayToOverlayIntersectionResultFromScriptValue);
74847484
74857485 bool clientScript = scriptManager->isClientScript();
@@ -7497,13 +7497,13 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 11 unmodified lines
74977497 }
74987498 #endif
74997499
7500− scriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>);
7501− scriptRegisterMetaType(scriptEngine.data(),
7500+ scriptRegisterMetaType(scriptEngine.get(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>);
7501+ scriptRegisterMetaType(scriptEngine.get(),
75027502 wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>);
75037503 scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
75047504
7505− scriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>);
7506− scriptRegisterMetaType(scriptEngine.data(),
7505+ scriptRegisterMetaType(scriptEngine.get(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>);
7506+ scriptRegisterMetaType(scriptEngine.get(),
75077507 wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>);
75087508 scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
75097509 // FIXME remove these deprecated names for the tablet scripting interface
@@ -7554,12 +7554,12 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 44 unmodified lines
75547554 scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
75557555 scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
75567556 scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance());
7557− scriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
7557+ scriptRegisterMetaType(scriptEngine.get(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
75587558
75597559 scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data());
75607560
75617561 scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data());
7562− scriptRegisterMetaType(scriptEngine.data(), worldDetailQualityToScriptValue, worldDetailQualityFromScriptValue);
7562+ scriptRegisterMetaType(scriptEngine.get(), worldDetailQualityToScriptValue, worldDetailQualityFromScriptValue);
75637563
75647564 scriptEngine->registerGlobalObject("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data());
75657565 scriptEngine->registerGlobalObject("Performance", new PerformanceScriptingInterface());
@@ -7574,7 +7574,7 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 8 unmodified lines
75747574 scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance());
75757575 scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get());
75767576
7577− GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data());
7577+ GraphicsScriptingInterface::registerMetaTypes(scriptEngine.get());
75787578 scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data());
75797579
75807580 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
@@ -7586,11 +7586,11 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 5 unmodified lines
75867586 scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data());
75877587
75887588 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
7589− scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.data(), steamClient.get()));
7589+ scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.get(), steamClient.get()));
75907590 }
75917591 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
75927592 scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
7593− UserInputMapper::registerControllerTypes(scriptEngine.data());
7593+ UserInputMapper::registerControllerTypes(scriptEngine.get());
75947594
75957595 auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
75967596 scriptEngine->registerGlobalObject("Recording", recordingInterface.data());
@@ -7606,18 +7606,18 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptManage · 9 unmodified lines
76067606 scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance()); // Deprecated.
76077607 scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
76087608
7609− registerInteractiveWindowMetaType(scriptEngine.data());
7609+ registerInteractiveWindowMetaType(scriptEngine.get());
76107610
76117611 auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>();
7612− pickScriptingInterface->registerMetaTypes(scriptEngine.data());
7612+ pickScriptingInterface->registerMetaTypes(scriptEngine.get());
76137613
76147614 // connect this script engines printedMessage signal to the global ScriptEngines these various messages
76157615 auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
7616− connect(scriptManager.data(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage);
7617− connect(scriptManager.data(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage);
7618− connect(scriptManager.data(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage);
7619− connect(scriptManager.data(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage);
7620− connect(scriptManager.data(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow);
7616+ connect(scriptManager.get(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage);
7617+ connect(scriptManager.get(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage);
7618+ connect(scriptManager.get(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage);
7619+ connect(scriptManager.get(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage);
7620+ connect(scriptManager.get(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow);
76217621
76227622 }
76237623