From bb652c078491365a295a967f3f23d6ad348aeb8e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 27 Oct 2014 16:01:39 -0700
Subject: [PATCH] rename signal in AbstractControllerScriptingInterface from
 cancel to back

---
 interface/src/scripting/ControllerScriptingInterface.cpp      | 4 ++--
 .../script-engine/src/AbstractControllerScriptingInterface.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index d2cc847ab5..a330cbc611 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -32,9 +32,9 @@ void ControllerScriptingInterface::handleMetaEvent(HFMetaEvent* event) {
     } else if (event->type() == HFActionEvent::endType()) {
         emit actionEndEvent(static_cast<HFActionEvent&>(*event));
     } else if (event->type() == HFBackEvent::startType()) {
-        emit cancelStartEvent();
+        emit backStartEvent();
     } else if (event->type() == HFBackEvent::endType()) {
-        emit cancelEndEvent();
+        emit backEndEvent();
     }
 }
 
diff --git a/libraries/script-engine/src/AbstractControllerScriptingInterface.h b/libraries/script-engine/src/AbstractControllerScriptingInterface.h
index 1eff64eb42..11755add8e 100644
--- a/libraries/script-engine/src/AbstractControllerScriptingInterface.h
+++ b/libraries/script-engine/src/AbstractControllerScriptingInterface.h
@@ -97,8 +97,8 @@ signals:
     void actionStartEvent(const HFActionEvent& event);
     void actionEndEvent(const HFActionEvent& event);
     
-    void cancelStartEvent();
-    void cancelEndEvent();
+    void backStartEvent();
+    void backEndEvent();
 
     void mouseMoveEvent(const MouseEvent& event, unsigned int deviceID = 0);
     void mousePressEvent(const MouseEvent& event, unsigned int deviceID = 0);