History

Fix naming. Move variable instantiation within scope

Vladyslav Stelmakhovskyi committed 9 years ago

Commit cedc3cf1 parent 13cd5001 file · +4 −4Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -5823,15 +5823,15 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) · 5822 unmodified lines
5823 5823
5824void Application::toggleRunningScriptsWidget() const { 5824void Application::toggleRunningScriptsWidget() const {
5825 auto scriptEngines = DependencyManager::get<ScriptEngines>();5825 auto scriptEngines = DependencyManager::get<ScriptEngines>();
5826 bool _scriptsRunning = !scriptEngines->getRunningScripts().isEmpty();5826 bool scriptsRunning = !scriptEngines->getRunningScripts().isEmpty();
5827 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();5827 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
5828
5829 auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));5828 auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
5830 auto hmd = DependencyManager::get<HMDScriptingInterface>();5829
5831 if (tablet->getToolbarMode() || false == _scriptsRunning) {5830 if (tablet->getToolbarMode() || false == scriptsRunning) {
5832 static const QUrl url("hifi/dialogs/RunningScripts.qml");5831 static const QUrl url("hifi/dialogs/RunningScripts.qml");
5833 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");5832 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
5834 } else {5833 } else {
5834 auto hmd = DependencyManager::get<HMDScriptingInterface>();
5835 if (!hmd->getShouldShowTablet() && !isHMDMode()) {5835 if (!hmd->getShouldShowTablet() && !isHMDMode()) {
5836 static const QUrl url("hifi/dialogs/RunningScripts.qml");5836 static const QUrl url("hifi/dialogs/RunningScripts.qml");
5837 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");5837 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");