LibGUI: Rename GTableModel => GModel.

Applications/ProcessManager/Makefile

@@ -1,5 +1,5 @@
 OBJS = \
-    ProcessTableModel.o \
+    ProcessModel.o \
     ProcessTableView.o \
     MemoryStatsWidget.o \
     main.o

Applications/ProcessManager/ProcessModel.cpp

@@ -1,10 +1,10 @@
-#include "ProcessTableModel.h"
+#include "ProcessModel.h"
 #include <LibGUI/GFile.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <pwd.h>
 
-ProcessTableModel::ProcessTableModel()
+ProcessModel::ProcessModel()
 {
     setpwent();
     while (auto* passwd = getpwent())
@@ -17,21 +17,21 @@ ProcessTableModel::ProcessTableModel()
     m_normal_priority_icon = GraphicsBitmap::load_from_file("/res/icons/normalpriority16.png");
 }
 
-ProcessTableModel::~ProcessTableModel()
+ProcessModel::~ProcessModel()
 {
 }
 
-int ProcessTableModel::row_count() const
+int ProcessModel::row_count() const
 {
     return m_processes.size();
 }
 
-int ProcessTableModel::column_count() const
+int ProcessModel::column_count() const
 {
     return Column::__Count;
 }
 
-String ProcessTableModel::column_name(int column) const
+String ProcessModel::column_name(int column) const
 {
     switch (column) {
     case Column::Icon: return "";
@@ -47,7 +47,7 @@ String ProcessTableModel::column_name(int column) const
     }
 }
 
-GTableModel::ColumnMetadata ProcessTableModel::column_metadata(int column) const
+GModel::ColumnMetadata ProcessModel::column_metadata(int column) const
 {
     switch (column) {
     case Column::Icon: return { 16, TextAlignment::CenterLeft };
@@ -68,7 +68,7 @@ static String pretty_byte_size(size_t size)
     return String::format("%uK", size / 1024);
 }
 
-GVariant ProcessTableModel::data(const GModelIndex& index, Role role) const
+GVariant ProcessModel::data(const GModelIndex& index, Role role) const
 {
     ASSERT(is_valid(index));
 
@@ -123,7 +123,7 @@ GVariant ProcessTableModel::data(const GModelIndex& index, Role role) const
     return { };
 }
 
-void ProcessTableModel::update()
+void ProcessModel::update()
 {
     GFile file("/proc/all");
     if (!file.open(GIODevice::ReadOnly)) {

Applications/ProcessManager/ProcessModel.h

@@ -3,10 +3,10 @@
 #include <AK/AKString.h>
 #include <AK/HashMap.h>
 #include <AK/Vector.h>
-#include <LibGUI/GTableModel.h>
+#include <LibGUI/GModel.h>
 #include <unistd.h>
 
-class ProcessTableModel final : public GTableModel {
+class ProcessModel final : public GModel {
 public:
     enum Column {
         Icon = 0,
@@ -21,8 +21,8 @@ public:
         __Count
     };
 
-    static Retained<ProcessTableModel> create() { return adopt(*new ProcessTableModel); }
-    virtual ~ProcessTableModel() override;
+    static Retained<ProcessModel> create() { return adopt(*new ProcessModel); }
+    virtual ~ProcessModel() override;
 
     virtual int row_count() const override;
     virtual int column_count() const override;
@@ -32,7 +32,7 @@ public:
     virtual void update() override;
 
 private:
-    ProcessTableModel();
+    ProcessModel();
 
     struct ProcessState {
         pid_t pid;

Applications/ProcessManager/ProcessTableView.cpp

@@ -1,13 +1,13 @@
 #include "ProcessTableView.h"
-#include "ProcessTableModel.h"
-#include <LibGUI/GSortingProxyTableModel.h>
+#include "ProcessModel.h"
+#include <LibGUI/GSortingProxyModel.h>
 #include <stdio.h>
 
 ProcessTableView::ProcessTableView(GWidget* parent)
     : GTableView(parent)
 {
-    set_model(GSortingProxyTableModel::create(ProcessTableModel::create()));
-    model()->set_key_column_and_sort_order(ProcessTableModel::Column::CPU, GSortOrder::Descending);
+    set_model(GSortingProxyModel::create(ProcessModel::create()));
+    model()->set_key_column_and_sort_order(ProcessModel::Column::CPU, GSortOrder::Descending);
     start_timer(1000);
     model()->update();
 }
@@ -33,5 +33,5 @@ pid_t ProcessTableView::selected_pid() const
 {
     if (!model()->selected_index().is_valid())
         return -1;
-    return model()->data({ model()->selected_index().row(), ProcessTableModel::Column::PID }, GTableModel::Role::Sort).as_int();
+    return model()->data({ model()->selected_index().row(), ProcessModel::Column::PID }, GModel::Role::Sort).as_int();
 }

Applications/ProcessManager/ProcessTableView.h

@@ -4,7 +4,7 @@
 #include <AK/Function.h>
 #include <unistd.h>
 
-class ProcessTableModel;
+class ProcessModel;
 
 class ProcessTableView final : public GTableView {
 public: