Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 23:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

undoing testing stuff also removing circular reference

Browse source
This commit is contained in:
amerhifi 2019-05-15 16:33:05 -07:00
parent 9c786f3c5a
commit 52afa64215
7 changed files with 19 additions and 28 deletions

2
libraries/platform/src/AndroidPlatform.cpp
View file

@ -7,7 +7,7 @@
//
#include "AndroidPlatform.h"
#include "platformJsonKeys.h"
#include <GPUIdent.h>
#include <string>

2
libraries/platform/src/LinuxPlatform.cpp
View file

@ -7,7 +7,7 @@
//
#include "LinuxPlatform.h"
#include "platformJsonKeys.h"
#include <GPUIdent.h>
#include <string>

1
libraries/platform/src/MACOSPlatform.cpp
View file

@ -7,6 +7,7 @@
//
#include "MACOSPlatform.h"
#include "platformJsonKeys.h"
#include <thread>
#include <GPUIdent.h>

1
libraries/platform/src/WINPlatform.cpp
View file

@ -7,6 +7,7 @@
//
#include "WINPlatform.h"
#include "platformJsonKeys.h"
#ifdef Q_OS_WINDOWS
#include <intrin.h>

12
libraries/platform/src/platformInstance.cpp
View file

@ -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;

1
libraries/platform/src/platformInstance.h
View file

@ -11,7 +11,6 @@
#include <vector>
#include <nlohmann/json.hpp>
#include "platformJsonKeys.h"
namespace platform {
using json = nlohmann::json;

28
libraries/platform/src/platformJsonKeys.h
View file

@ -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