From 5902484f39fea0751093368e3181ac8cbe37e9a6 Mon Sep 17 00:00:00 2001
From: masiboss <32394683+masiboss@users.noreply.github.com>
Date: Thu, 7 Dec 2023 21:42:11 +0100
Subject: [PATCH] simplify removal of "Apple"

---
 src/osx/btop_collect.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp
index 9ad107c..e410c74 100644
--- a/src/osx/btop_collect.cpp
+++ b/src/osx/btop_collect.cpp
@@ -227,11 +227,6 @@ namespace Cpu {
 				name = name_vec.at(cpu_pos + 1);
 			else
 				name.clear();
-		} else if (v_contains(name_vec, "Apple"s)) {
-			auto apple_pos = v_index(name_vec, "Apple"s);
-			name = (apple_pos < name_vec.size() - 1 ? name_vec.at(apple_pos + 1) : "")
-			+ (apple_pos < name_vec.size() - 1 && name_vec.size() > 2 ? ' ' + name_vec.at(apple_pos + 2) : "")
-			+ (apple_pos < name_vec.size() - 1 && name_vec.size() > 3 ? ' ' + name_vec.at(apple_pos + 3) : "");
 		} else
 			name.clear();
 
@@ -241,7 +236,7 @@ namespace Cpu {
 				name += n + ' ';
 			}
 			name.pop_back();
-				for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Core"}) {
+				for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Apple", "Core"}) {
 					name = s_replace(name, replace, "");
 					name = s_replace(name, "  ", " ");
 				}