Convert lambdas to methods

Author: stsdc

src/Views/ProcessView/ProcessTreeView/ProcessTreeView.vala

@@ -17,83 +17,41 @@ public class Monitor.ProcessTreeView : Granite.Bin {
         };
 
         var name_item_factory = new Gtk.SignalListItemFactory ();
+        name_item_factory.setup.connect (name_item_setup_factory);
+        name_item_factory.bind.connect (name_item_bind_factory);
+
         var cpu_item_factory = new Gtk.SignalListItemFactory ();
+        cpu_item_factory.setup.connect (generic_item_setup_factory);
+        cpu_item_factory.bind.connect (cpu_item_bind_factory);
+
         var memory_item_factory = new Gtk.SignalListItemFactory ();
+        memory_item_factory.setup.connect (generic_item_setup_factory);
+        memory_item_factory.bind.connect (memory_item_bind_factory);
+
         var pid_item_factory = new Gtk.SignalListItemFactory ();
+        pid_item_factory.setup.connect (generic_item_setup_factory);
+        pid_item_factory.bind.connect (pid_item_bind_factory);
 
-        name_item_factory.setup.connect ((factory, obj) => {
-            var cell = (Gtk.ColumnViewCell) obj;
-
-            var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 4) {
-                hexpand = true,
-                halign = START
-            };
-            var icon = new Gtk.Image.from_icon_name ("application-x-executable") {
-                pixel_size = 16
-            };
-
-            box.append (icon);
-            box.append (new Gtk.Label (Utils.NO_DATA));
-            cell.child = box;
-        });
-
-        name_item_factory.bind.connect ((factory, obj) => {
-            var cell = (Gtk.ColumnViewCell) obj;
-            var box = (Gtk.Box) cell.child;
-            var label = (Gtk.Label) box.get_last_child ();
-            var icon = (Gtk.Image) box.get_first_child ();
-
-            var item = (ProcessRowData) cell.item;
-            label.label = item.name;
-            icon.gicon = item.icon;
-        });
 
         var name_column = new Gtk.ColumnViewColumn (_("Process Name"), name_item_factory) {
             sorter = model.str_sorter ("name"),
             expand = true
         };
         list.append_column (name_column);
 
-        cpu_item_factory.setup.connect (metric_setup_factory);
-
-        cpu_item_factory.bind.connect ((factory, obj) => {
-            var cell = (Gtk.ColumnViewCell) obj;
-            var label = (Gtk.Label) cell.child;
-            var item = (ProcessRowData) cell.item;
-            label.label = "%.0f%%".printf (item.cpu);
-        });
-
         var cpu_column = new Gtk.ColumnViewColumn (_("CPU"), cpu_item_factory) {
             sorter = model.num_sorter ("cpu"),
             expand = false
         };
         list.append_column (cpu_column);
 
-        memory_item_factory.setup.connect (metric_setup_factory);
-
-        memory_item_factory.bind.connect ((factory, obj) => {
-            var cell = (Gtk.ColumnViewCell) obj;
-            var label = (Gtk.Label) cell.child;
-            var item = (ProcessRowData) cell.item;
-
-            label.label = format_size (item.memory, IEC_UNITS);
-        });
 
         var mem_column = new Gtk.ColumnViewColumn (_("Memory"), memory_item_factory) {
             sorter = model.num_sorter ("memory"),
             expand = false
         };
         list.append_column (mem_column);
 
-        pid_item_factory.setup.connect (metric_setup_factory);
-
-        pid_item_factory.bind.connect ((factory, obj) => {
-            var cell = (Gtk.ColumnViewCell) obj;
-            var label = (Gtk.Label) cell.child;
-            var item = (ProcessRowData) cell.item;
-            label.label = "%d".printf (item.pid);
-        });
-
         var pid_column = new Gtk.ColumnViewColumn (_("PID"), pid_item_factory) {
             sorter = model.num_sorter ("pid"),
             expand = false
@@ -102,12 +60,60 @@ public class Monitor.ProcessTreeView : Granite.Bin {
 
     }
 
-    private void metric_setup_factory (Object object) {
+    private void generic_item_setup_factory (Object object) {
         var cell = (Gtk.ColumnViewCell) object;
         cell.child = new Gtk.Label (Utils.NO_DATA) {
             hexpand = true,
             halign = START
         };
     }
 
+    private void name_item_setup_factory (Object object) {
+        var cell = (Gtk.ColumnViewCell) object;
+
+        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 4) {
+            hexpand = true,
+            halign = START
+        };
+        var icon = new Gtk.Image.from_icon_name ("application-x-executable") {
+            pixel_size = 16
+        };
+
+        box.append (icon);
+        box.append (new Gtk.Label (Utils.NO_DATA));
+        cell.child = box;
+    }
+
+    private void name_item_bind_factory (Object object) {
+        var cell = (Gtk.ColumnViewCell) object;
+        var box = (Gtk.Box) cell.child;
+        var label = (Gtk.Label) box.get_last_child ();
+        var icon = (Gtk.Image) box.get_first_child ();
+
+        var item = (ProcessRowData) cell.item;
+        label.label = item.name;
+        icon.gicon = item.icon;
+    }
+
+    private void cpu_item_bind_factory (Object object) {
+        var cell = (Gtk.ColumnViewCell) object;
+        var label = (Gtk.Label) cell.child;
+        var item = (ProcessRowData) cell.item;
+        label.label = "%.0f%%".printf (item.cpu);
+    }
+
+    private void memory_item_bind_factory (Object object) {
+        var cell = (Gtk.ColumnViewCell) object;
+        var label = (Gtk.Label) cell.child;
+        var item = (ProcessRowData) cell.item;
+        label.label = format_size (item.memory, IEC_UNITS);
+    }
+
+    private void pid_item_bind_factory (Object object) {
+        var cell = (Gtk.ColumnViewCell) object;
+        var label = (Gtk.Label) cell.child;
+        var item = (ProcessRowData) cell.item;
+        label.label = "%d".printf (item.pid);
+    }
+
 }