From 3b448ce1fe118fae6333419a6424eeed945b1155 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@highfidelity.io>
Date: Thu, 16 May 2019 16:38:59 -0700
Subject: [PATCH] moving to only one computer. also a bit of cleanup:

---
 libraries/platform/src/AndroidPlatform.cpp  | 5 ++---
 libraries/platform/src/LinuxPlatform.cpp    | 3 +--
 libraries/platform/src/MACOSPlatform.cpp    | 8 ++------
 libraries/platform/src/platform.cpp         | 8 ++------
 libraries/platform/src/platform.h           | 7 +++----
 libraries/platform/src/platformInstance.cpp | 9 ---------
 libraries/platform/src/platformInstance.h   | 6 +++---
 7 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/libraries/platform/src/AndroidPlatform.cpp b/libraries/platform/src/AndroidPlatform.cpp
index 57b0cf04bc..f35674a984 100644
--- a/libraries/platform/src/AndroidPlatform.cpp
+++ b/libraries/platform/src/AndroidPlatform.cpp
@@ -8,9 +8,8 @@
 
 #include "AndroidPlatform.h"
 #include "platformJsonKeys.h"
-
 #include <GPUIdent.h>
-#include <string>
+
 using namespace platform;
 
 void AndroidInstance::enumerateCpu() {
@@ -39,7 +38,7 @@ void AndroidInstance::enumerateMemory() {
     _memory.push_back(ram);
 }
 
-void AndroidInstance::::enumerateComputer(){
+void AndroidInstance::enumerateComputer(){
     //no implememntation at this time
 }
 
diff --git a/libraries/platform/src/LinuxPlatform.cpp b/libraries/platform/src/LinuxPlatform.cpp
index df425f417e..aa63eb1e08 100644
--- a/libraries/platform/src/LinuxPlatform.cpp
+++ b/libraries/platform/src/LinuxPlatform.cpp
@@ -9,7 +9,6 @@
 #include "LinuxPlatform.h"
 #include "platformJsonKeys.h"
 #include <GPUIdent.h>
-#include <string>
 
 using namespace platform;
 void LinuxInstance::enumerateCpu() {
@@ -41,7 +40,7 @@ void LinuxInstance::enumerateMemory() {
     _memory.push_back(ram);
 }
 
-void LinuxInstance::::enumerateComputer(){
+void LinuxInstance::enumerateComputer(){
     //no implememntation at this time
 }
 
diff --git a/libraries/platform/src/MACOSPlatform.cpp b/libraries/platform/src/MACOSPlatform.cpp
index 019594aedd..7081044879 100644
--- a/libraries/platform/src/MACOSPlatform.cpp
+++ b/libraries/platform/src/MACOSPlatform.cpp
@@ -98,12 +98,8 @@ void MACOSInstance::enumerateComputer(){
     char* model = (char *) malloc(sizeof(char)*len+1);
     sysctlbyname("hw.model", model, &len, NULL,0);
     
-    
-    json computer;
-    computer["computerModel"]=std::string(model);
-    
-    _computer.push_back(computer);
-    
+    _computer["computerModel"]=std::string(model);
+
     free(model);
     
 #endif
diff --git a/libraries/platform/src/platform.cpp b/libraries/platform/src/platform.cpp
index 8c305ebed5..64bd536eee 100644
--- a/libraries/platform/src/platform.cpp
+++ b/libraries/platform/src/platform.cpp
@@ -78,10 +78,6 @@ json platform::getMemory(int index) {
     return _instance->getMemory(index);
 }
 
-int platform::getNumComputer(){
-    return _instance->getNumComputer();
-}
-
-json platform::getComputer(int index){
-    return _instance->getComputer(index);
+json platform::getComputer(){
+    return _instance->getComputer();
 }
diff --git a/libraries/platform/src/platform.h b/libraries/platform/src/platform.h
index 9dd3d4ab2f..14ec5fa8b2 100644
--- a/libraries/platform/src/platform.h
+++ b/libraries/platform/src/platform.h
@@ -9,8 +9,7 @@
 #ifndef hifi_Platform_h
 #define hifi_Platform_h
 
-#include "platformInstance.h"
-#include <vector>
+
 #include <nlohmann/json.hpp>
 
 namespace platform {
@@ -32,8 +31,8 @@ json getDisplay(int index);
 int getNumMemory();
 json getMemory(int index);
 
-int getNumComputer();
-json getComputer(int index);
+json getComputer();
+    
 }  // namespace platform
 
 #endif  // hifi_platform_h
diff --git a/libraries/platform/src/platformInstance.cpp b/libraries/platform/src/platformInstance.cpp
index 1996ba9567..9eccaa43c6 100644
--- a/libraries/platform/src/platformInstance.cpp
+++ b/libraries/platform/src/platformInstance.cpp
@@ -7,7 +7,6 @@
 //
 
 
-#include "platform.h"
 #include "platformInstance.h"
 #include <QtGlobal>
 
@@ -47,14 +46,6 @@ json Instance::getGPU(int index) {
     return _gpu.at(index);
 }
 
-json Instance::getComputer(int index){
-    if(index >= (int)_computer.size()){
-        return json();
-    }
-    
-    return _computer.at(index);
-}
-
 json Instance::getDisplay(int index) {
     assert(index <(int) _display.size());
     
diff --git a/libraries/platform/src/platformInstance.h b/libraries/platform/src/platformInstance.h
index f5947e7392..8d0a181e3d 100644
--- a/libraries/platform/src/platformInstance.h
+++ b/libraries/platform/src/platformInstance.h
@@ -31,8 +31,8 @@ public:
     int getNumDisplay() { return (int)_display.size(); }
     json getDisplay(int index);
 
-    int getNumComputer() {return (int)_computer.size();}
-    json getComputer(int index);
+    
+    json getComputer() {return _computer;}
     
     void virtual enumerateCpu()=0;
     void virtual enumerateMemory()=0;
@@ -46,7 +46,7 @@ protected:
     std::vector<json>  _memory;
     std::vector<json>  _gpu;
     std::vector<json>  _display;
-    std::vector<json>  _computer;
+    json  _computer;
 };
 
 }  // namespace platform