rename HFCancelEvent to HFBackEvent, fire from joystick

Stephen Birarda committed 12 years ago

Commit 8a9f2d11 parent 04e7e975 files · +33 −20Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

@@ -10,7 +10,7 @@ · 9 unmodified lines
10	10	//
11	11
12	12	#include <HandData.h>
13		−#include <HFCancelEvent.h>
	13	+#include <HFBackEvent.h>
14	14
15	15	#include "Application.h"
16	16	#include "devices/MotionTracker.h"
@@ -31,9 +31,9 @@ void ControllerScriptingInterface::handleMetaEvent(HFMetaEvent* event) { · 14 unmodified lines
31	31	emit actionStartEvent(static_cast<HFActionEvent&>(*event));
32	32	} else if (event->type() == HFActionEvent::endType()) {
33	33	emit actionEndEvent(static_cast<HFActionEvent&>(*event));
34		− } else if (event->type() == HFCancelEvent::startType()) {
	34	+ } else if (event->type() == HFBackEvent::startType()) {
35	35	emit cancelStartEvent();
36		− } else if (event->type() == HFCancelEvent::endType()) {
	36	+ } else if (event->type() == HFBackEvent::endType()) {
37	37	emit cancelEndEvent();
38	38	}
39	39	}