From e1bf3f2540c9a4b7f4c7b7fd7f3637271d1b281a Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 26 Aug 2019 11:46:04 -0700
Subject: [PATCH] PR feedback

---
 interface/src/Application.cpp                      | 8 ++++----
 libraries/shared/src/shared/PlatformHelper.cpp     | 4 ++++
 libraries/shared/src/shared/PlatformHelper.h       | 2 ++
 libraries/shared/src/shared/platform/MacHelper.cpp | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b81f303589..2d78724122 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -956,7 +956,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<AvatarPackager>();
     PlatformHelper::setup();
     
-    QObject::connect(DependencyManager::get<PlatformHelper>().get(), &PlatformHelper::systemWillWake, [] {
+    QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
         QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
     });
 
@@ -1167,13 +1167,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
         // Pause the deadlock watchdog when we sleep, or it might 
         // trigger a false positive when we wake back up
-        auto platformHelper = DependencyManager::get<PlatformHelper>();
+        auto platformHelper = PlatformHelper::instance();
 
-        connect(platformHelper.get(), &PlatformHelper::systemWillSleep, [] {
+        connect(platformHelper, &PlatformHelper::systemWillSleep, [] {
             DeadlockWatchdogThread::pause();
         });
 
-        connect(platformHelper.get(), &PlatformHelper::systemWillWake, [] {
+        connect(platformHelper, &PlatformHelper::systemWillWake, [] {
             DeadlockWatchdogThread::resume();
         });
 
diff --git a/libraries/shared/src/shared/PlatformHelper.cpp b/libraries/shared/src/shared/PlatformHelper.cpp
index a1a1ef4125..51c282a9f8 100644
--- a/libraries/shared/src/shared/PlatformHelper.cpp
+++ b/libraries/shared/src/shared/PlatformHelper.cpp
@@ -25,3 +25,7 @@ void PlatformHelper::shutdown() {
     DependencyManager::destroy<PlatformHelper>();
 }
 
+PlatformHelper* PlatformHelper::instance() {
+    return DependencyManager::get<PlatformHelper>().get();
+}
+
diff --git a/libraries/shared/src/shared/PlatformHelper.h b/libraries/shared/src/shared/PlatformHelper.h
index cdfff1b9fc..760eb7bd42 100644
--- a/libraries/shared/src/shared/PlatformHelper.h
+++ b/libraries/shared/src/shared/PlatformHelper.h
@@ -32,6 +32,8 @@ public:
     static void setup();
     // Run the per-platform code to cleanly shutdown a platform-dependent PlatformHelper dependency object
     static void shutdown();
+    // Fetch the platform specific instance of the helper
+    static PlatformHelper* instance();
     
     std::atomic<bool> _awake{ true };
 };
diff --git a/libraries/shared/src/shared/platform/MacHelper.cpp b/libraries/shared/src/shared/platform/MacHelper.cpp
index 7bc10142ad..453dcc2760 100644
--- a/libraries/shared/src/shared/platform/MacHelper.cpp
+++ b/libraries/shared/src/shared/platform/MacHelper.cpp
@@ -9,7 +9,7 @@
 
 #include "../PlatformHelper.h"
 
-#if !defined(Q_OS_ANDROID) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
 #include <IOKit/IOMessage.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>