From b37a6f689a2e2478409cddff5885b4bf2f9b3ca3 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 28 Oct 2015 12:51:22 -0700
Subject: [PATCH] Fixing typo and review comments

---
 interface/resources/controllers/standard.json             | 2 +-
 interface/src/Application.cpp                             | 1 -
 libraries/controllers/src/controllers/Actions.cpp         | 2 --
 libraries/controllers/src/controllers/Actions.h           | 4 +---
 libraries/controllers/src/controllers/StateController.cpp | 8 ++++----
 libraries/controllers/src/controllers/StateController.h   | 3 +--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 4ef0a1b90f..8ba9056076 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -3,7 +3,7 @@
     "channels": [
         { "from": "Standard.LY", "to": "Actions.TranslateZ" },
         { "from": "Standard.LX", "to": "Actions.TranslateX" },
-         { "from": "Standard.RX", "to": "Actions.Yaw" },
+        { "from": "Standard.RX", "to": "Actions.Yaw" },
         { "from": "Standard.RY", "to": "Actions.Pitch" },
 
         { "from": [ "Standard.DU", "Standard.DL", "Standard.DR", "Standard.DD" ], "to": "Standard.LeftPrimaryThumb" },
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d47c2b547e..0ccb9de28a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -647,7 +647,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     // Setup the keyboardMouseDevice and the user input mapper with the default bindings
     userInputMapper->registerDevice(_keyboardMouseDevice);
 
-    //userInputMapper->getApplicationDevice()->(float)qApp->getAvatarUpdater()->isHMDMode()
 
     // check first run...
     if (_firstRun.get()) {
diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp
index 979c8a70c1..a9bd32b1d8 100644
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@@ -75,8 +75,6 @@ namespace controller {
                 makeAxisPair(Action::BOOM_IN, "BoomIn"),
                 makeAxisPair(Action::BOOM_OUT, "BoomOut"),
 
-                makeButtonPair(Action::IN_HMD, "InHMD"),
-
                 // Deprecated aliases
                 // FIXME remove after we port all scripts
                 makeAxisPair(Action::LONGITUDINAL_BACKWARD, "LONGITUDINAL_BACKWARD"),
diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h
index 187fcd46a0..971da13cf0 100644
--- a/libraries/controllers/src/controllers/Actions.h
+++ b/libraries/controllers/src/controllers/Actions.h
@@ -77,9 +77,7 @@ enum class Action {
     // Biseced aliases for TRANSLATE_CAMERA_Z
     BOOM_IN,
     BOOM_OUT,
-
-    IN_HMD, // THis is a read only action ?
-
+    
     NUM_ACTIONS,
 };
 
diff --git a/libraries/controllers/src/controllers/StateController.cpp b/libraries/controllers/src/controllers/StateController.cpp
index ef735422db..29b30bc24e 100644
--- a/libraries/controllers/src/controllers/StateController.cpp
+++ b/libraries/controllers/src/controllers/StateController.cpp
@@ -30,7 +30,7 @@ void StateController::update(float deltaTime, bool jointsCaptured) {}
 void StateController::focusOutEvent() {}
 
 void StateController::addInputVariant(QString name, ReadLambda& lambda) {
-    namedReadLambdas.push_back(NamedReadLambda(name, lambda));
+    _namedReadLambdas.push_back(NamedReadLambda(name, lambda));
 }
 void StateController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
     proxy->_name = _name;
@@ -42,15 +42,15 @@ void StateController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
         QVector<Input::NamedPair> availableInputs;
         
         int i = 0;
-        for (auto pair : namedReadLambdas) {
+        for (auto& pair : _namedReadLambdas) {
             availableInputs.push_back(Input::NamedPair(Input(_deviceID, i, ChannelType::BUTTON), pair.first));
             i++;
         }
         return availableInputs;
     };
     proxy->createEndpoint = [this] (const Input& input) -> Endpoint::Pointer {
-        if (input.getChannel() < namedReadLambdas.size()) {
-            return std::make_shared<LambdaEndpoint>(namedReadLambdas[input.getChannel()].second);
+        if (input.getChannel() < _namedReadLambdas.size()) {
+            return std::make_shared<LambdaEndpoint>(_namedReadLambdas[input.getChannel()].second);
         }
 
         return Endpoint::Pointer();
diff --git a/libraries/controllers/src/controllers/StateController.h b/libraries/controllers/src/controllers/StateController.h
index afd0456b5a..963f884d98 100644
--- a/libraries/controllers/src/controllers/StateController.h
+++ b/libraries/controllers/src/controllers/StateController.h
@@ -40,8 +40,7 @@ public:
 
     void addInputVariant(QString name, ReadLambda& lambda);
 
-    QVector<NamedReadLambda> namedReadLambdas;
-    QVector<Input::NamedPair> availableInputs;
+    QVector<NamedReadLambda> _namedReadLambdas;
 };
 
 }