From 9e25c3b7d8d6446b7e678accf06d1da945868de4 Mon Sep 17 00:00:00 2001
From: 1P-Cusack <1p-cusack@1stplayable.com>
Date: Tue, 25 Jul 2017 14:47:34 -0400
Subject: [PATCH] Renaming 'not' route to 'logicalNot'.

Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
---
 interface/resources/controllers/vive.json                     | 4 ++--
 libraries/controllers/src/controllers/impl/Filter.cpp         | 2 +-
 .../controllers/src/controllers/impl/RouteBuilderProxy.cpp    | 2 +-
 .../controllers/src/controllers/impl/RouteBuilderProxy.h      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index cc8e2a437a..73ab5cb2ae 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -24,7 +24,7 @@
         { "from": "Vive.LS", "to": "Standard.LS" },
         { "from": "Vive.LSTouch", "to": "Standard.LeftThumbUp",
             "peek": true,
-            "filters": [ { "type": "not" } ]
+            "filters": [ { "type": "logicalNot" } ]
         },
         { "from": "Vive.LSTouch", "to": "Standard.LSTouch" },
 
@@ -42,7 +42,7 @@
         { "from": "Vive.RS", "to": "Standard.RS" },
         { "from": "Vive.RSTouch", "to": "Standard.RightThumbUp",
             "peek": true,
-            "filters": [ { "type": "not" } ]
+            "filters": [ { "type": "logicalNot" } ]
         },
         { "from": "Vive.RSTouch", "to": "Standard.RSTouch" },
 
diff --git a/libraries/controllers/src/controllers/impl/Filter.cpp b/libraries/controllers/src/controllers/impl/Filter.cpp
index 08cba9c296..b6c3ed4d27 100644
--- a/libraries/controllers/src/controllers/impl/Filter.cpp
+++ b/libraries/controllers/src/controllers/impl/Filter.cpp
@@ -41,7 +41,7 @@ REGISTER_FILTER_CLASS_INSTANCE(ConstrainToPositiveIntegerFilter, "constrainToPos
 REGISTER_FILTER_CLASS_INSTANCE(DeadZoneFilter, "deadZone")
 REGISTER_FILTER_CLASS_INSTANCE(HysteresisFilter, "hysteresis")
 REGISTER_FILTER_CLASS_INSTANCE(InvertFilter, "invert")
-REGISTER_FILTER_CLASS_INSTANCE(NotFilter, "not")
+REGISTER_FILTER_CLASS_INSTANCE(NotFilter, "logicalNot")
 REGISTER_FILTER_CLASS_INSTANCE(ScaleFilter, "scale")
 REGISTER_FILTER_CLASS_INSTANCE(PulseFilter, "pulse")
 REGISTER_FILTER_CLASS_INSTANCE(TranslateFilter, "translate")
diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
index c6abc2d402..bc1ef55725 100644
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
@@ -149,7 +149,7 @@ QObject* RouteBuilderProxy::pulse(float interval) {
     return this;
 }
 
-QObject* RouteBuilderProxy::not() {
+QObject* RouteBuilderProxy::logicalNot() {
     addFilter(std::make_shared<NotFilter>());
     return this;
 }
diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
index d70bdb649f..75f3747566 100644
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
@@ -53,7 +53,7 @@ class RouteBuilderProxy : public QObject {
         Q_INVOKABLE QObject* postTransform(glm::mat4 transform);
         Q_INVOKABLE QObject* rotate(glm::quat rotation);
         Q_INVOKABLE QObject* lowVelocity(float rotationConstant, float translationConstant);
-        Q_INVOKABLE QObject* not();
+        Q_INVOKABLE QObject* logicalNot();
 
     private:
         void to(const Endpoint::Pointer& destination);