diff options
| author | aristocratos <admin@qvantnet.com> | 2021-11-13 23:15:53 +0100 |
|---|---|---|
| committer | aristocratos <admin@qvantnet.com> | 2021-11-13 23:15:53 +0100 |
| commit | c2c4fe47db3002c3433114954c22bd92b149bea0 (patch) | |
| tree | df24b422e85566d57b1da3d0f2e4194d5edae0ba /src/osx | |
| parent | bd5d86708907397f7fc40868ff3665e23f24bb8a (diff) | |
Changes from main + fixesOSX
Diffstat (limited to 'src/osx')
| -rw-r--r-- | src/osx/btop_collect.cpp | 10 | ||||
| -rw-r--r-- | src/osx/sensors.cpp | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp index ac9fb22..f976a55 100644 --- a/src/osx/btop_collect.cpp +++ b/src/osx/btop_collect.cpp @@ -230,11 +230,11 @@ namespace Cpu { name += n + ' '; } name.pop_back(); - for (const auto ® : {regex("Processor"), regex("CPU"), regex("\\(R\\)"), regex("\\(TM\\)"), regex("Intel"), - regex("AMD"), regex("Core"), regex("\\d?\\.?\\d+[mMgG][hH][zZ]")}) { - name = std::regex_replace(name, reg, ""); - } - name = trim(name); + for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Core"}) { + name = s_replace(name, replace, ""); + name = s_replace(name, " ", " "); + } + name = trim(name); } return name; diff --git a/src/osx/sensors.cpp b/src/osx/sensors.cpp index a76d9c9..bd6312e 100644 --- a/src/osx/sensors.cpp +++ b/src/osx/sensors.cpp @@ -3,11 +3,9 @@ #include <CoreFoundation/CoreFoundation.h> #include <IOKit/hidsystem/IOHIDEventSystemClient.h> -#include <btop_tools.hpp> -#include <iostream> -#include <map> #include <string> #include <numeric> +#include <vector> extern "C" { typedef struct __IOHIDEvent *IOHIDEventRef; @@ -62,7 +60,7 @@ long long Cpu::ThermalSensors::getSensors() { IOHIDEventSystemClientRef system = IOHIDEventSystemClientCreate(kCFAllocatorDefault); IOHIDEventSystemClientSetMatching(system, thermalSensors); CFArrayRef matchingsrvs = IOHIDEventSystemClientCopyServices(system); - vector<double> temps; + std::vector<double> temps; if (matchingsrvs) { long count = CFArrayGetCount(matchingsrvs); for (int i = 0; i < count; i++) { |