From 4bbae1230d74a0784f2391480bdf6b5aeb657e18 Mon Sep 17 00:00:00 2001 From: danteruiz Date: Tue, 19 Feb 2019 10:07:36 -0800 Subject: [PATCH] making requested chantges --- interface/src/raypick/PickScriptingInterface.cpp | 4 ++-- interface/src/raypick/PointerScriptingInterface.cpp | 4 ++-- libraries/pointers/src/PickCacheOptimizer.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp index cf7680bb6c..09f4b68cb9 100644 --- a/interface/src/raypick/PickScriptingInterface.cpp +++ b/interface/src/raypick/PickScriptingInterface.cpp @@ -76,8 +76,8 @@ unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) { QString jointName { "" }; if (propMap["joint"].isValid()) { QString jointName = propMap["joint"].toString(); - QString mouseJoint { "Mouse" }; - if (jointName == mouseJoint) { + const QString MOUSE_JOINT = "Mouse"; + if (jointName == MOUSE_JOINT) { return PointerEvent::INVALID_POINTER_ID; } } diff --git a/interface/src/raypick/PointerScriptingInterface.cpp b/interface/src/raypick/PointerScriptingInterface.cpp index 10761e0696..1c80caff88 100644 --- a/interface/src/raypick/PointerScriptingInterface.cpp +++ b/interface/src/raypick/PointerScriptingInterface.cpp @@ -154,8 +154,8 @@ unsigned int PointerScriptingInterface::createLaserPointer(const QVariant& prope QString jointName { "" }; if (propertyMap["joint"].isValid()) { QString jointName = propertyMap["joint"].toString(); - QString mouseJoint { "Mouse" }; - if (jointName == mouseJoint) { + const QString MOUSE_JOINT = "Mouse"; + if (jointName == MOUSE_JOINT) { return PointerEvent::INVALID_POINTER_ID; } } diff --git a/libraries/pointers/src/PickCacheOptimizer.h b/libraries/pointers/src/PickCacheOptimizer.h index 6aa343480b..0bbdfea8e4 100644 --- a/libraries/pointers/src/PickCacheOptimizer.h +++ b/libraries/pointers/src/PickCacheOptimizer.h @@ -11,8 +11,6 @@ #include #include "Pick.h" -#include "PerfStat.h" -#include "Profile.h" typedef struct PickCacheKey { PickFilter::Flags mask;