From 52afa64215c7b9ba95492a1c2ab2f5b86e9a5d08 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@highfidelity.io>
Date: Wed, 15 May 2019 16:33:05 -0700
Subject: [PATCH] undoing testing stuff also removing circular reference

---
 libraries/platform/src/AndroidPlatform.cpp  |  2 +-
 libraries/platform/src/LinuxPlatform.cpp    |  2 +-
 libraries/platform/src/MACOSPlatform.cpp    |  1 +
 libraries/platform/src/WINPlatform.cpp      |  1 +
 libraries/platform/src/platformInstance.cpp | 12 +--------
 libraries/platform/src/platformInstance.h   |  1 -
 libraries/platform/src/platformJsonKeys.h   | 28 ++++++++++-----------
 7 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/libraries/platform/src/AndroidPlatform.cpp b/libraries/platform/src/AndroidPlatform.cpp
index e44e8e156a..58274df9f5 100644
--- a/libraries/platform/src/AndroidPlatform.cpp
+++ b/libraries/platform/src/AndroidPlatform.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "AndroidPlatform.h"
-
+#include "platformJsonKeys.h"
 
 #include <GPUIdent.h>
 #include <string>
diff --git a/libraries/platform/src/LinuxPlatform.cpp b/libraries/platform/src/LinuxPlatform.cpp
index df72b899b3..b22344e728 100644
--- a/libraries/platform/src/LinuxPlatform.cpp
+++ b/libraries/platform/src/LinuxPlatform.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "LinuxPlatform.h"
-
+#include "platformJsonKeys.h"
 #include <GPUIdent.h>
 #include <string>
 
diff --git a/libraries/platform/src/MACOSPlatform.cpp b/libraries/platform/src/MACOSPlatform.cpp
index c48fe32079..cdb9283657 100644
--- a/libraries/platform/src/MACOSPlatform.cpp
+++ b/libraries/platform/src/MACOSPlatform.cpp
@@ -7,6 +7,7 @@
 //
 
 #include "MACOSPlatform.h"
+#include "platformJsonKeys.h"
 
 #include <thread>
 #include <GPUIdent.h>
diff --git a/libraries/platform/src/WINPlatform.cpp b/libraries/platform/src/WINPlatform.cpp
index 93c7aee84d..cc10b47442 100644
--- a/libraries/platform/src/WINPlatform.cpp
+++ b/libraries/platform/src/WINPlatform.cpp
@@ -7,6 +7,7 @@
 //
 
 #include "WINPlatform.h"
+#include "platformJsonKeys.h"
 
 #ifdef Q_OS_WINDOWS
 #include <intrin.h>
diff --git a/libraries/platform/src/platformInstance.cpp b/libraries/platform/src/platformInstance.cpp
index 705f5bd358..f1cef32096 100644
--- a/libraries/platform/src/platformInstance.cpp
+++ b/libraries/platform/src/platformInstance.cpp
@@ -10,17 +10,7 @@
 #include "platform.h"
 
 #include <QtGlobal>
-
-#ifdef Q_OS_WIN
-#include "WINPlatform.h"
-#endif
-
-#ifdef Q_OS_MACOS
-#include "MACOSPlatform.h"
-#endif
-
-#ifdef Q_OS_LINUX
-#endif
+#include "platformInstance.h"
 
 using namespace platform;
 
diff --git a/libraries/platform/src/platformInstance.h b/libraries/platform/src/platformInstance.h
index 7ebefc7c6d..4770200f07 100644
--- a/libraries/platform/src/platformInstance.h
+++ b/libraries/platform/src/platformInstance.h
@@ -11,7 +11,6 @@
 
 #include <vector>
 #include <nlohmann/json.hpp>
-#include "platformJsonKeys.h"
 
 namespace platform {
     using json = nlohmann::json;
diff --git a/libraries/platform/src/platformJsonKeys.h b/libraries/platform/src/platformJsonKeys.h
index cc2832a584..a46d5e5b89 100644
--- a/libraries/platform/src/platformJsonKeys.h
+++ b/libraries/platform/src/platformJsonKeys.h
@@ -11,20 +11,20 @@
 
 namespace platform {
     namespace jsonKeys{
-        const char*  cpuBrand { "cpuBrand"};
-        const char*  cpuModel {"cpuModel"};
-        const char*  cpuClockSpeed {"clockSpeed"};
-        const char*  cpuNumCores { "numCores"};
-        const char*  gpuName  {"GpuName"};
-        const char*  gpuMemory {"gpuMemory"};
-        const char*  gpuDriver  {"gpuDriver"};
-        const char*  totalMemory  {"totalMem"};
-        const char*  displayDescription { "description"};
-        const char*  displayName  {"deviceName"};
-        const char*  displayCoordsLeft {"coordinatesleft"};
-        const char*  displayCoordsRight { "coordinatesright"};
-        const char*  displayCoordsTop { "coordinatestop"};
-        const char*  displayCoordsBottom { "coordinatesbottom"};
+        static const char*  cpuBrand { "cpuBrand"};
+        static const char*  cpuModel {"cpuModel"};
+        static const char*  cpuClockSpeed {"clockSpeed"};
+        static const char*  cpuNumCores { "numCores"};
+        static const char*  gpuName  {"GpuName"};
+        static const char*  gpuMemory {"gpuMemory"};
+        static const char*  gpuDriver  {"gpuDriver"};
+        static const char*  totalMemory  {"totalMem"};
+        static const char*  displayDescription { "description"};
+        static const char*  displayName  {"deviceName"};
+        static const char*  displayCoordsLeft {"coordinatesleft"};
+        static const char*  displayCoordsRight { "coordinatesright"};
+        static const char*  displayCoordsTop { "coordinatestop"};
+        static const char*  displayCoordsBottom { "coordinatesbottom"};
     }
 
 } // namespace platform