Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 16:55:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

testing gcc warnings

Browse source
This commit is contained in:
amerhifi 2019-05-15 14:57:33 -07:00
parent 1da5298086
commit 633c0dfbac
5 changed files with 45 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,19 +15,19 @@ using namespace platform;
void AndroidInstance::enumerateCpu() {
json cpu;
cpu["cpuBrand"] = "";
cpu["cpuModel"] = "";
cpu["cpuClockSpeed"] = "";
cpu["cpuNumCores"] = "";
cpu[jsonKeys::cpuBrand] = "";
cpu[jsonKeys::cpuModel] = "";
cpu[jsonKeys::cpuClockSpeed] = "";
cpu[jsonKeys::cpuNumCores] = "";
_cpu.push_back(cpu);
}
void AndroidInstance::enumerateGpu() {
GPUIdent* ident = GPUIdent::getInstance();
json gpu = {};
gpu["gpuName"] = ident->getName().toUtf8().constData();
gpu["gpuMemory"] = ident->getMemory();
gpu["gpuDriver"] = ident->getDriver().toUtf8().constData();
gpu[jsonKeys::gpuName] = ident->getName().toUtf8().constData();
gpu[jsonKeys::gpuMemory] = ident->getMemory();
gpu[jsonKeys::gpuDriver] = ident->getDriver().toUtf8().constData();
_gpu.push_back(gpu);
_display = ident->getOutput();
@ -35,6 +35,6 @@ void AndroidInstance::enumerateGpu() {
void AndroidInstance::enumerateMemory() {
json ram = {};
ram[jsonKeys::totalMemory]="";
_memory.push_back(ram);
}

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

@ -15,10 +15,10 @@ using namespace platform;
void LinuxInstance::enumerateCpu() {
json cpu = {};
cpu["cpuBrand"] = "";
cpu["cpuModel"] = "";
cpu["cpuClockSpeed"] = "";
cpu["cpuNumCores"] = "";
cpu[jsonKeys::cpuBrand] = "";
cpu[jsonKeys::cpuModel] = "";
cpu[jsonKeys::cpuClockSpeed] = "";
cpu[jsonKeys::cpuNumCores] = "";
_cpu.push_back(cpu);
}
@ -26,9 +26,9 @@ void LinuxInstance::enumerateCpu() {
void LinuxInstance::enumerateGpu() {
GPUIdent* ident = GPUIdent::getInstance();
json gpu = {};
gpu["gpuName"] = ident->getName().toUtf8().constData();
gpu["gpuMemory"] = ident->getMemory();
gpu["gpuDriver"] = ident->getDriver().toUtf8().constData();
gpu[jsonKeys::gpuName] = ident->getName().toUtf8().constData();
gpu[jsonKeys::gpuMemory] = ident->getMemory();
gpu[jsonKeys::gpuDriver] = ident->getDriver().toUtf8().constData();
_gpu.push_back(gpu);
_display = ident->getOutput();
@ -36,7 +36,7 @@ void LinuxInstance::enumerateGpu() {
void LinuxInstance::enumerateMemory() {
json ram = {};
ram[jsonKeys::totalMemory]="";
_memory.push_back(ram);
}

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

@ -55,10 +55,10 @@ void MACOSInstance::enumerateCpu() {
}
}
cpu["cpuBrand"] = CPUBrandString;
cpu["cpuModel"] = CPUModelString;
cpu["cpuClockSpeed"] = CPUClockString;
cpu["cpuNumCores"] = std::thread::hardware_concurrency();
cpu[jsonKeys::cpuBrand] = CPUBrandString;
cpu[jsonKeys::cpuModel] = CPUModelString;
cpu[jsonKeys::cpuClockSpeed] = CPUClockString;
cpu[jsonKeys::cpuNumCores] = std::thread::hardware_concurrency();
_cpu.push_back(cpu);
}
@ -66,9 +66,9 @@ void MACOSInstance::enumerateCpu() {
void MACOSInstance::enumerateGpu() {
GPUIdent* ident = GPUIdent::getInstance();
json gpu = {};
gpu["gpuName"] = ident->getName().toUtf8().constData();
gpu["gpuMemory"] = ident->getMemory();
gpu["gpuDriver"] = ident->getDriver().toUtf8().constData();
gpu[jsonKeys::gpuName] = ident->getName().toUtf8().constData();
gpu[jsonKeys::gpuMemory] = ident->getMemory();
gpu[jsonKeys::gpuDriver] = ident->getDriver().toUtf8().constData();
_gpu.push_back(gpu);
_display = ident->getOutput();
@ -80,7 +80,7 @@ void MACOSInstance::enumerateMemory() {
#ifdef Q_OS_MAC
long pages = sysconf(_SC_PHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE);
ram["totalMemory"] = pages * page_size;;
ram[jsonKeys::totalMemory] = pages * page_size;;
#endif
_memory.push_back(ram);
}

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

@ -46,10 +46,10 @@ void WINInstance::enumerateCpu() {
}
}
cpu["cpuBrand"] = CPUBrandString;
cpu["cpuModel"] = CPUModelString;
cpu["cpuClockSpeed"] = CPUClockString;
cpu["cpuNumCores"] = std::thread::hardware_concurrency();
cpu[platform::json::cpuBrand] = CPUBrandString;
cpu[jsonKeys::cpuModel] = CPUModelString;
cpu[jsonKeys::cpuClockSpeed] = CPUClockString;
cpu[jsonKeys::cpuNumCores] = std::thread::hardware_concurrency();
#endif
_cpu.push_back(cpu);
@ -60,9 +60,9 @@ void WINInstance::enumerateGpu() {
GPUIdent* ident = GPUIdent::getInstance();
json gpu = {};
gpu["gpuName"] = ident->getName().toUtf8().constData();
gpu["gpuMemory"] = ident->getMemory();
gpu["gpuDriver"] = ident->getDriver().toUtf8().constData();
gpu[jsonKeys::gpuName] = ident->getName().toUtf8().constData();
gpu[jsonKeys::gpuMemory] = ident->getMemory();
gpu[jsonKeys::gpuDriver] = ident->getDriver().toUtf8().constData();
_gpu.push_back(gpu);
_display = ident->getOutput();

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

@ -11,22 +11,20 @@
namespace platform {
namespace jsonKeys{
#if 0
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"};
#endif
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"};
}
} // namespace platform