From a3e677e64fc48f0e413aa4e8bfa10a93d553b453 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 20 Jul 2018 08:32:21 +1200
Subject: [PATCH] Code review

---
 interface/src/Application.cpp                               | 2 +-
 .../src/display-plugins/hmd/HmdDisplayPlugin.h              | 2 +-
 plugins/oculus/src/OculusBaseDisplayPlugin.cpp              | 6 +++---
 plugins/oculus/src/OculusBaseDisplayPlugin.h                | 2 +-
 plugins/openvr/src/OpenVrDisplayPlugin.cpp                  | 6 +++---
 plugins/openvr/src/OpenVrDisplayPlugin.h                    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 526f0da5ba..6152a549c2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2719,7 +2719,7 @@ void Application::initializeDisplayPlugins() {
             [this](const QSize& size) { resizeGL(); });
         QObject::connect(displayPlugin.get(), &DisplayPlugin::resetSensorsRequested, this, &Application::requestReset);
         if (displayPlugin->isHmd()) {
-            QObject::connect(dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get()), &HmdDisplayPlugin::isHmdMountedChanged,
+            QObject::connect(dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get()), &HmdDisplayPlugin::hmdMountedChanged,
                 DependencyManager::get<HMDScriptingInterface>().data(), &HMDScriptingInterface::mountedChanged);
         }
     }
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index 22a12b7922..fb10084b09 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -47,7 +47,7 @@ public:
     virtual bool onDisplayTextureReset() override { _clearPreviewFlag = true; return true; };
 
 signals:
-    void isHmdMountedChanged();
+    void hmdMountedChanged();
 
 protected:
     virtual void hmdPresent() = 0;
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 60515314b6..36790d1b50 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -36,9 +36,9 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     if (ovr::reorientRequested(status)) {
         emit resetSensorsRequested();
     }
-    if (ovr::hmdMounted(status) != _isHmdMounted) {
-        _isHmdMounted = !_isHmdMounted;
-        emit isHmdMountedChanged();
+    if (ovr::hmdMounted(status) != _hmdMounted) {
+        _hmdMounted = !_hmdMounted;
+        emit hmdMountedChanged();
     }
 
     _currentRenderFrameInfo = FrameInfo();
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index aa6130c293..244c06ecf5 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -44,5 +44,5 @@ protected:
     ovrLayerEyeFov _sceneLayer;
     ovrViewScaleDesc _viewScaleDesc;
     // ovrLayerEyeFovDepth _depthLayer;
-    bool _isHmdMounted { false };
+    bool _hmdMounted { false };
 };
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index c3fdad6e82..cd56eeff39 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -701,9 +701,9 @@ void OpenVrDisplayPlugin::postPreview() {
         _nextRenderPoseData = nextRender;
     }
 
-    if (isHmdMounted() != _isHmdMounted) {
-        _isHmdMounted = !_isHmdMounted;
-        emit isHmdMountedChanged();
+    if (isHmdMounted() != _hmdMounted) {
+        _hmdMounted = !_hmdMounted;
+        emit hmdMountedChanged();
     }
 }
 
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h
index a6ee93931d..add35d6383 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.h
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.h
@@ -91,5 +91,5 @@ private:
 
     bool _asyncReprojectionActive { false };
 
-    bool _isHmdMounted { false };
+    bool _hmdMounted { false };
 };