浏览代码

Kernel: Rename ProcessorInfo::{m_brandstr => m_brand}

There's no need to specify the type of the member in it's name,
especially not in shorthand format.
Idan Horowitz 3 年之前
父节点
当前提交
f9528f1882

+ 2 - 2
Kernel/Arch/x86/ProcessorInfo.h

@@ -20,7 +20,7 @@ class Processor;
 class ProcessorInfo {
     Processor& m_processor;
     String m_cpuid;
-    String m_brandstr;
+    String m_brand;
     NonnullOwnPtr<KString> m_features;
     u32 m_display_model;
     u32 m_display_family;
@@ -32,7 +32,7 @@ public:
     ProcessorInfo(Processor& processor);
 
     const String& cpuid() const { return m_cpuid; }
-    const String& brandstr() const { return m_brandstr; }
+    const String& brand() const { return m_brand; }
     StringView features() const { return m_features->view(); }
     u32 display_model() const { return m_display_model; }
     u32 display_family() const { return m_display_family; }

+ 1 - 1
Kernel/Arch/x86/common/ProcessorInfo.cpp

@@ -69,7 +69,7 @@ ProcessorInfo::ProcessorInfo(Processor& processor)
         copy_brand_string_part_to_buffer(0);
         copy_brand_string_part_to_buffer(1);
         copy_brand_string_part_to_buffer(2);
-        m_brandstr = buffer;
+        m_brand = buffer;
     }
 }
 

+ 1 - 1
Kernel/GlobalProcessExposed.cpp

@@ -572,7 +572,7 @@ private:
                 obj.add("model", info.display_model());
                 obj.add("stepping", info.stepping());
                 obj.add("type", info.type());
-                obj.add("brandstr", info.brandstr());
+                obj.add("brand", info.brand());
             });
         array.finish();
         return {};

+ 1 - 1
Userland/Applications/SystemMonitor/main.cpp

@@ -577,7 +577,7 @@ NonnullRefPtr<GUI::Widget> build_hardware_tab()
             Vector<GUI::JsonArrayModel::FieldSpec> processors_field;
             processors_field.empend("processor", "Processor", Gfx::TextAlignment::CenterRight);
             processors_field.empend("cpuid", "CPUID", Gfx::TextAlignment::CenterLeft);
-            processors_field.empend("brandstr", "Brand", Gfx::TextAlignment::CenterLeft);
+            processors_field.empend("brand", "Brand", Gfx::TextAlignment::CenterLeft);
             processors_field.empend("Features", Gfx::TextAlignment::CenterLeft, [](auto& object) {
                 StringBuilder builder;
                 auto features = object.get("features").as_array();