From 75f1168b19c12bdf08b4547eb445fbc007e891b2 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 12 Apr 2017 12:02:54 -0700
Subject: [PATCH] Clearer function names
---
interface/src/Application.cpp | 2 +-
interface/src/scripting/WindowScriptingInterface.h | 2 +-
scripts/system/notifications.js | 2 +-
scripts/system/snapshot.js | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index edf6cb3847..9c523f53e8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6417,7 +6417,7 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa
// If we're not doing an animated snapshot as well...
if (!includeAnimated || !(SnapshotAnimated::alsoTakeAnimatedSnapshot.get())) {
// Tell the dependency manager that the capture of the still snapshot has taken place.
- emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, notify);
+ emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(path, notify);
} else {
// Get an animated GIF snapshot and save it
SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, qApp, DependencyManager::get<WindowScriptingInterface>());
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 30f4b223fd..d4ff278fea 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -71,7 +71,7 @@ signals:
void domainChanged(const QString& domainHostname);
void svoImportRequested(const QString& url);
void domainConnectionRefused(const QString& reasonMessage, int reasonCode, const QString& extraInfo);
- void snapshotTaken(const QString& pathStillSnapshot, bool notify);
+ void stillSnapshotTaken(const QString& pathStillSnapshot, bool notify);
void snapshotShared(const QString& error);
void processingGifStarted(const QString& pathStillSnapshot);
void processingGifCompleted(const QString& pathAnimatedSnapshot);
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index fab09b0848..006ef3f90f 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -656,7 +656,7 @@ Script.update.connect(update);
Script.scriptEnding.connect(scriptEnding);
Menu.menuItemEvent.connect(menuItemEvent);
Window.domainConnectionRefused.connect(onDomainConnectionRefused);
-Window.snapshotTaken.connect(onSnapshotTaken);
+Window.stillSnapshotTaken.connect(onSnapshotTaken);
Window.processingGifStarted.connect(processingGif);
Window.connectionAdded.connect(connectionAdded);
Window.connectionError.connect(connectionError);
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 19fdfc510d..ee441278aa 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -157,7 +157,7 @@ function onClicked() {
resetOverlays = Menu.isOptionChecked("Overlays"); // For completness. Certainly true if the button is visible to be clicke.
reticleVisible = Reticle.visible;
Reticle.visible = false;
- Window.snapshotTaken.connect(snapshotTaken);
+ Window.stillSnapshotTaken.connect(stillSnapshotTaken);
Window.processingGifStarted.connect(processingGifStarted);
Window.processingGifCompleted.connect(processingGifCompleted);
@@ -195,14 +195,14 @@ function isDomainOpen(id) {
response.total_entries;
}
-function snapshotTaken(pathStillSnapshot, notify) {
+function stillSnapshotTaken(pathStillSnapshot, notify) {
// show hud
Reticle.visible = reticleVisible;
// show overlays if they were on
if (resetOverlays) {
Menu.setIsOptionChecked("Overlays", true);
}
- Window.snapshotTaken.disconnect(snapshotTaken);
+ Window.stillSnapshotTaken.disconnect(stillSnapshotTaken);
// A Snapshot Review dialog might be left open indefinitely after taking the picture,
// during which time the user may have moved. So stash that info in the dialog so that