From 3b181eb80378db12d1917efa7cc20040fa15cc60 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 21 Feb 2017 13:56:28 -0800 Subject: [PATCH] code review --- interface/src/Application.cpp | 8 ++++---- interface/src/Application.h | 4 ++-- interface/src/ui/overlays/Overlays.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e9f6e3d7f5..3de7906f56 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6895,12 +6895,12 @@ void Application::toggleMuteAudio() { menu->setIsOptionChecked(MenuOption::MuteAudio, !menu->isOptionChecked(MenuOption::MuteAudio)); } -OverlayID Application::getTabletScreenID() { +OverlayID Application::getTabletScreenID() const { auto HMD = DependencyManager::get(); - return HMD->getCurrentTabletScreenID(); + return HMD->getCurrentTabletScreenID(); } -OverlayID Application::getTabletHomeButtonID() { +OverlayID Application::getTabletHomeButtonID() const { auto HMD = DependencyManager::get(); - return HMD->getCurrentHomeButtonUUID(); + return HMD->getCurrentHomeButtonUUID(); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 26264af09c..662523ce1d 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -298,8 +298,8 @@ public: Q_INVOKABLE void sendHoverOverEntity(QUuid id, PointerEvent event); Q_INVOKABLE void sendHoverLeaveEntity(QUuid id, PointerEvent event); - OverlayID getTabletScreenID(); - OverlayID getTabletHomeButtonID(); + OverlayID getTabletScreenID() const; + OverlayID getTabletHomeButtonID() const; signals: void svoImportRequested(const QString& url); diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index f3a78c9350..c18d9ddaef 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -462,7 +462,7 @@ RayToOverlayIntersectionResult::RayToOverlayIntersectionResult() : QScriptValue RayToOverlayIntersectionResultToScriptValue(QScriptEngine* engine, const RayToOverlayIntersectionResult& value) { auto obj = engine->newObject(); obj.setProperty("intersects", value.intersects); - obj.setProperty("overlayID", OverlayIDtoScriptValue(engine, value.overlayID)); + obj.setProperty("overlayID", OverlayIDtoScriptValue(engine, value.overlayID)); obj.setProperty("distance", value.distance); QString faceName = "";