From 646a5798e601b68a7d450812f12188b5714ba64d Mon Sep 17 00:00:00 2001
From: Phil <35943148+Phil-Palmer@users.noreply.github.com>
Date: Mon, 4 Jan 2021 00:12:57 -0500
Subject: [PATCH] Apply suggestions from code review

Tidying (bracing style, spaces, remove final comma from enum, fix JSDoc comments).

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 interface/src/avatar/MyAvatar.h             | 18 ++++++------------
 libraries/physics/src/CharacterController.h |  3 +--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index a411b1d747..77f964ee3c 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -283,8 +283,7 @@ class MyAvatar : public Avatar {
      *     the value.</p>
      * @property {number} analogPlusSprintSpeed - The sprint (run) speed of your avatar for the "AnalogPlus" control scheme.
      * @property {MyAvatar.SitStandModelType} userRecenterModel - Controls avatar leaning and recentering behavior.
-     *     <p class="important">Deprecated: This property is deprecated and will be removed. If you need it, please contact 
-     *     the developers.</p>
+     *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
      * @property {boolean} isInSittingState - <code>true</code> if the user wearing the HMD is determined to be sitting;
      *     <code>false</code> if the user wearing the HMD is determined to be standing.  This can affect whether the avatar
      *     is allowed to stand, lean or recenter its footing, depending on user preferences.
@@ -416,10 +415,7 @@ class MyAvatar : public Avatar {
     Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed NOTIFY sprintSpeedChanged);
     Q_PROPERTY(bool isInSittingState READ getIsInSittingState WRITE setIsInSittingState);
 
-    /**jsdoc
-    * @deprecated This property is deprecated and will be removed. If you need it, please contact the developers.
-    */	
-    Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel);
+    Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel);  // Deprecated
 
     /**jsdoc
     * @deprecated This property is deprecated and will be removed.  If you need it, please contact the developers. 
@@ -532,8 +528,7 @@ public:
 
     /**jsdoc
      * <p>Specifies different avatar leaning and recentering behaviors.</p>
-     * <p class="important">Deprecated: This enumeration is deprecated and will be removed. If you need it, please contact 
-     *     the developers</p>
+     * <p class="important">Deprecated: This type is deprecated and will be removed.</p>
      * <table>
      *   <thead>
      *     <tr><th>Value</th><th>Name</th><th>Description</th></tr>
@@ -574,14 +569,13 @@ public:
     Q_ENUM(AllowAvatarStandingPreference)
 
     // Note: The option strings in setupPreferences (PreferencesDialog.cpp) must match this order.
-    enum class AllowAvatarLeaningPreference : uint
-    {
+    enum class AllowAvatarLeaningPreference : uint {
         WhenUserIsStanding,
         Always,
         Never,
         AlwaysNoRecenter,  // experimental
         Count,
-        Default = WhenUserIsStanding,
+        Default = WhenUserIsStanding
     };
     Q_ENUM(AllowAvatarLeaningPreference)
 
@@ -2981,7 +2975,7 @@ private:
 
     bool _centerOfGravityModelEnabled { true };
     bool _hmdLeanRecenterEnabled { true };
-    bool _hmdCrouchRecenterEnabled{
+    bool _hmdCrouchRecenterEnabled {
         true
     };  // Is MyAvatar allowed to recenter vertically (stand) when the user is sitting in the real world.
     bool _sprint { false };
diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h
index 899c99890b..8242ae4b97 100755
--- a/libraries/physics/src/CharacterController.h
+++ b/libraries/physics/src/CharacterController.h
@@ -53,8 +53,7 @@ const btScalar MIN_CHARACTER_MOTOR_TIMESCALE = 0.05f;
 class CharacterController : public btCharacterControllerInterface {
 
 public:
-    enum class FollowType : uint8_t
-    {
+    enum class FollowType : uint8_t {
         Rotation,
         Horizontal,
         Vertical,