From 81b0ddb2da5db2fa9eda80bc70b9190f6ae2c921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Sep 2024 10:37:54 +0800 Subject: [PATCH] Chore: rename temps_apple --- CMakeLists.txt | 2 +- src/detection/battery/battery_apple.c | 2 +- src/detection/cpu/cpu_apple.c | 2 +- src/detection/gpu/gpu_apple.c | 2 +- src/{detection/temps/temps_apple.c => util/apple/smc_temps.c} | 2 +- src/{detection/temps/temps_apple.h => util/apple/smc_temps.h} | 1 - 6 files changed, 5 insertions(+), 6 deletions(-) rename src/{detection/temps/temps_apple.c => util/apple/smc_temps.c} (99%) rename src/{detection/temps/temps_apple.h => util/apple/smc_temps.h} (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f55e06d5..a25c9ac5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -689,7 +689,6 @@ elseif(APPLE) src/detection/processes/processes_bsd.c src/detection/sound/sound_apple.c src/detection/swap/swap_apple.c - src/detection/temps/temps_apple.c src/detection/terminalfont/terminalfont_apple.m src/detection/terminalshell/terminalshell_linux.c src/detection/terminalsize/terminalsize_linux.c @@ -705,6 +704,7 @@ elseif(APPLE) src/detection/zpool/zpool_nosupport.c src/util/apple/cf_helpers.c src/util/apple/osascript.m + src/util/apple/smc_temps.c src/util/platform/FFPlatform_unix.c src/util/binary_apple.c ) diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c index 1de81b96..4f3d809b 100644 --- a/src/detection/battery/battery_apple.c +++ b/src/detection/battery/battery_apple.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "battery.h" #include "util/apple/cf_helpers.h" -#include "detection/temps/temps_apple.h" +#include "util/apple/smc_temps.h" #include #include diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c index efdad950..b08a8b5b 100644 --- a/src/detection/cpu/cpu_apple.c +++ b/src/detection/cpu/cpu_apple.c @@ -1,6 +1,6 @@ #include "cpu.h" #include "common/sysctl.h" -#include "detection/temps/temps_apple.h" +#include "util/apple/smc_temps.h" #include "util/stringUtils.h" static double detectCpuTemp(const FFstrbuf* cpuName) diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c index 1190a636..5abf0040 100644 --- a/src/detection/gpu/gpu_apple.c +++ b/src/detection/gpu/gpu_apple.c @@ -1,8 +1,8 @@ #include "gpu.h" #include "common/library.h" #include "detection/cpu/cpu.h" -#include "detection/temps/temps_apple.h" #include "util/apple/cf_helpers.h" +#include "util/apple/smc_temps.h" #include diff --git a/src/detection/temps/temps_apple.c b/src/util/apple/smc_temps.c similarity index 99% rename from src/detection/temps/temps_apple.c rename to src/util/apple/smc_temps.c index c4cef782..1f9d8179 100644 --- a/src/detection/temps/temps_apple.c +++ b/src/util/apple/smc_temps.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "temps_apple.h" +#include "smc_temps.h" #include "util/stringUtils.h" #include diff --git a/src/detection/temps/temps_apple.h b/src/util/apple/smc_temps.h similarity index 95% rename from src/detection/temps/temps_apple.h rename to src/util/apple/smc_temps.h index c04b4156..0d6e104c 100644 --- a/src/detection/temps/temps_apple.h +++ b/src/util/apple/smc_temps.h @@ -1,7 +1,6 @@ #pragma once #include "fastfetch.h" -#include "util/FFlist.h" typedef struct FFTempValue {