GNOME.org
 

[gnome-control-center] power: Use self variable naming style

commit edec4b6575bcf8a76b9eba3ce72afb03ea6ba690
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Nov 25 09:33:35 2020 +1300

    power: Use self variable naming style

 panels/power/cc-battery-row.h       | 12 +++---
 panels/power/cc-brightness-scale.h  |  2 +-
 panels/power/cc-power-panel.c       | 30 ++++++-------
 panels/power/cc-power-profile-row.c | 84 ++++++++++++++++++-------------------
 panels/power/cc-power-profile-row.h |  2 +-
 5 files changed, 65 insertions(+), 65 deletions(-)
---
diff --git a/panels/power/cc-battery-row.h b/panels/power/cc-battery-row.h
index e3b72feb2..8a5b5fa69 100644
--- a/panels/power/cc-battery-row.h
+++ b/panels/power/cc-battery-row.h
@@ -31,19 +31,19 @@ G_DECLARE_FINAL_TYPE (CcBatteryRow, cc_battery_row, CC, BATTERY_ROW, GtkListBoxR
 CcBatteryRow* cc_battery_row_new                    (UpDevice *device,
                                                      gboolean  primary);
 
-void          cc_battery_row_set_level_sizegroup     (CcBatteryRow *self,
+void          cc_battery_row_set_level_sizegroup     (CcBatteryRow *row,
                                                       GtkSizeGroup *sizegroup);
 
-void          cc_battery_row_set_row_sizegroup       (CcBatteryRow *self,
+void          cc_battery_row_set_row_sizegroup       (CcBatteryRow *row,
                                                       GtkSizeGroup *sizegroup);
 
-void          cc_battery_row_set_charge_sizegroup    (CcBatteryRow *self,
+void          cc_battery_row_set_charge_sizegroup    (CcBatteryRow *row,
                                                       GtkSizeGroup *sizegroup);
 
-void          cc_battery_row_set_battery_sizegroup   (CcBatteryRow *self,
+void          cc_battery_row_set_battery_sizegroup   (CcBatteryRow *row,
                                                       GtkSizeGroup *sizegroup);
 
-gboolean      cc_battery_row_get_primary             (CcBatteryRow *self);
-UpDeviceKind  cc_battery_row_get_kind                (CcBatteryRow *self);
+gboolean      cc_battery_row_get_primary             (CcBatteryRow *row);
+UpDeviceKind  cc_battery_row_get_kind                (CcBatteryRow *row);
 
 G_END_DECLS
\ No newline at end of file
diff --git a/panels/power/cc-brightness-scale.h b/panels/power/cc-brightness-scale.h
index b55d05b33..d566dff77 100644
--- a/panels/power/cc-brightness-scale.h
+++ b/panels/power/cc-brightness-scale.h
@@ -33,6 +33,6 @@ typedef enum {
 #define CC_TYPE_BRIGHTNESS_SCALE (cc_brightness_scale_get_type())
 G_DECLARE_FINAL_TYPE (CcBrightnessScale, cc_brightness_scale, CC, BRIGHTNESS_SCALE, GtkBox)
 
-gboolean cc_brightness_scale_get_has_brightness (CcBrightnessScale*);
+gboolean cc_brightness_scale_get_has_brightness (CcBrightnessScale *scale);
 
 G_END_DECLS
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 0d70cb841..33a2239ef 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -254,16 +254,16 @@ add_battery (CcPowerPanel *panel, UpDevice *device, gboolean primary)
 }
 
 static void
-add_device (CcPowerPanel *panel, UpDevice *device)
+add_device (CcPowerPanel *self, UpDevice *device)
 {
   CcBatteryRow *row = cc_battery_row_new (device, FALSE);
-  cc_battery_row_set_level_sizegroup (row, panel->level_sizegroup);
-  cc_battery_row_set_row_sizegroup (row, panel->row_sizegroup);
-  cc_battery_row_set_charge_sizegroup (row, panel->charge_sizegroup);
-  cc_battery_row_set_battery_sizegroup (row, panel->battery_sizegroup);
+  cc_battery_row_set_level_sizegroup (row, self->level_sizegroup);
+  cc_battery_row_set_row_sizegroup (row, self->row_sizegroup);
+  cc_battery_row_set_charge_sizegroup (row, self->charge_sizegroup);
+  cc_battery_row_set_battery_sizegroup (row, self->battery_sizegroup);
 
-  gtk_container_add (GTK_CONTAINER (panel->device_listbox), GTK_WIDGET (row));
-  gtk_widget_set_visible (GTK_WIDGET (panel->device_section), TRUE);
+  gtk_container_add (GTK_CONTAINER (self->device_listbox), GTK_WIDGET (row));
+  gtk_widget_set_visible (GTK_WIDGET (self->device_section), TRUE);
 }
 
 static void
@@ -660,32 +660,32 @@ bt_switch_changed_cb (CcPowerPanel *self)
 }
 
 static void
-bt_powered_state_changed (CcPowerPanel *panel)
+bt_powered_state_changed (CcPowerPanel *self)
 {
   gboolean powered, has_airplane_mode;
   g_autoptr(GVariant) v1 = NULL;
   g_autoptr(GVariant) v2 = NULL;
 
-  v1 = g_dbus_proxy_get_cached_property (panel->bt_rfkill, "BluetoothHasAirplaneMode");
+  v1 = g_dbus_proxy_get_cached_property (self->bt_rfkill, "BluetoothHasAirplaneMode");
   has_airplane_mode = g_variant_get_boolean (v1);
 
   if (!has_airplane_mode)
     {
       g_debug ("BluetoothHasAirplaneMode is false, hiding Bluetooth power row");
-      gtk_widget_hide (GTK_WIDGET (panel->bt_row));
+      gtk_widget_hide (GTK_WIDGET (self->bt_row));
       return;
     }
 
-  v2 = g_dbus_proxy_get_cached_property (panel->bt_rfkill, "BluetoothAirplaneMode");
+  v2 = g_dbus_proxy_get_cached_property (self->bt_rfkill, "BluetoothAirplaneMode");
   powered = !g_variant_get_boolean (v2);
 
   g_debug ("bt powered state changed to %s", powered ? "on" : "off");
 
-  gtk_widget_show (GTK_WIDGET (panel->bt_row));
+  gtk_widget_show (GTK_WIDGET (self->bt_row));
 
-  g_signal_handlers_block_by_func (panel->bt_switch, bt_switch_changed_cb, panel);
-  gtk_switch_set_active (panel->bt_switch, powered);
-  g_signal_handlers_unblock_by_func (panel->bt_switch, bt_switch_changed_cb, panel);
+  g_signal_handlers_block_by_func (self->bt_switch, bt_switch_changed_cb, self);
+  gtk_switch_set_active (self->bt_switch, powered);
+  g_signal_handlers_unblock_by_func (self->bt_switch, bt_switch_changed_cb, self);
 }
 
 #ifdef HAVE_NETWORK_MANAGER
diff --git a/panels/power/cc-power-profile-row.c b/panels/power/cc-power-profile-row.c
index c6934f27a..7e2f25fd0 100644
--- a/panels/power/cc-power-profile-row.c
+++ b/panels/power/cc-power-profile-row.c
@@ -71,18 +71,18 @@ get_performance_inhibited_text (const char *inhibited)
 }
 
 static void
-performance_profile_set_inhibited (CcPowerProfileRow *row,
+performance_profile_set_inhibited (CcPowerProfileRow *self,
                                    const char        *performance_inhibited)
 {
   const char *text;
   gboolean inhibited = FALSE;
 
-  if (row->power_profile != CC_POWER_PROFILE_PERFORMANCE)
+  if (self->power_profile != CC_POWER_PROFILE_PERFORMANCE)
     return;
 
-  gtk_style_context_remove_class (gtk_widget_get_style_context (row->subtext),
+  gtk_style_context_remove_class (gtk_widget_get_style_context (self->subtext),
                                   GTK_STYLE_CLASS_DIM_LABEL);
-  gtk_style_context_remove_class (gtk_widget_get_style_context (row->subtext),
+  gtk_style_context_remove_class (gtk_widget_get_style_context (self->subtext),
                                   GTK_STYLE_CLASS_ERROR);
 
   text = get_performance_inhibited_text (performance_inhibited);
@@ -90,11 +90,11 @@ performance_profile_set_inhibited (CcPowerProfileRow *row,
     inhibited = TRUE;
   else
     text = _("High performance and power usage.");
-  gtk_label_set_text (GTK_LABEL (row->subtext), text);
+  gtk_label_set_text (GTK_LABEL (self->subtext), text);
 
-  gtk_style_context_add_class (gtk_widget_get_style_context (row->subtext),
+  gtk_style_context_add_class (gtk_widget_get_style_context (self->subtext),
                                inhibited ? GTK_STYLE_CLASS_ERROR : GTK_STYLE_CLASS_DIM_LABEL);
-  gtk_widget_set_sensitive (GTK_WIDGET (row), !inhibited);
+  gtk_widget_set_sensitive (GTK_WIDGET (self), !inhibited);
 }
 
 static void
@@ -126,18 +126,18 @@ cc_power_profile_row_set_property (GObject      *object,
                           const GValue *value,
                           GParamSpec   *pspec)
 {
-  CcPowerProfileRow *row = (CcPowerProfileRow *)object;
+  CcPowerProfileRow *self = (CcPowerProfileRow *)object;
 
   switch (prop_id)
     {
     case PROP_POWER_PROFILE:
-      g_assert (row->power_profile == -1);
-      row->power_profile = g_value_get_int (value);
-      g_assert (row->power_profile != -1);
+      g_assert (self->power_profile == -1);
+      self->power_profile = g_value_get_int (value);
+      g_assert (self->power_profile != -1);
       break;
 
     case PROP_PERFORMANCE_INHIBITED:
-      cc_power_profile_row_set_performance_inhibited (row, g_value_get_string (value));
+      cc_power_profile_row_set_performance_inhibited (self, g_value_get_string (value));
       break;
 
     default:
@@ -219,21 +219,21 @@ performance_row_new (const gchar  *title,
 }
 
 static void
-cc_power_profile_row_button_toggled_cb (GObject *row)
+cc_power_profile_row_button_toggled_cb (CcPowerProfileRow *self)
 {
-  g_signal_emit (row, signals[BUTTON_TOGGLED], 0);
+  g_signal_emit (self, signals[BUTTON_TOGGLED], 0);
 }
 
 static void
 cc_power_profile_row_constructed (GObject *object)
 {
-  CcPowerProfileRow *row;
+  CcPowerProfileRow *self;
   GtkWidget *box, *title;
   const char *text, *subtext, *icon_name, *class_name;
 
-  row = CC_POWER_PROFILE_ROW (object);
+  self = CC_POWER_PROFILE_ROW (object);
 
-  switch (row->power_profile)
+  switch (self->power_profile)
     {
       case CC_POWER_PROFILE_PERFORMANCE:
         text = _("Performance");
@@ -257,24 +257,24 @@ cc_power_profile_row_constructed (GObject *object)
         g_assert_not_reached ();
     }
 
-  gtk_list_box_row_set_selectable (GTK_LIST_BOX_ROW (row), FALSE);
-  gtk_widget_show (GTK_WIDGET (row));
+  gtk_list_box_row_set_selectable (GTK_LIST_BOX_ROW (self), FALSE);
+  gtk_widget_show (GTK_WIDGET (self));
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   g_object_set (G_OBJECT (box),
                 "margin-end", 12,
                 "margin-start", 12,
                 "visible", TRUE,
                 NULL);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_container_add (GTK_CONTAINER (self), box);
 
   title = performance_row_new (text, icon_name, class_name, subtext);
-  row->subtext = g_object_get_data (G_OBJECT (title), "subtext");
-  row->button = g_object_get_data (G_OBJECT (title), "button");
-  g_signal_connect_object (G_OBJECT (row->button), "toggled",
+  self->subtext = g_object_get_data (G_OBJECT (title), "subtext");
+  self->button = g_object_get_data (G_OBJECT (title), "button");
+  g_signal_connect_object (G_OBJECT (self->button), "toggled",
                            G_CALLBACK (cc_power_profile_row_button_toggled_cb),
-                           row, G_CONNECT_SWAPPED);
-  if (row->power_profile == CC_POWER_PROFILE_PERFORMANCE)
-    performance_profile_set_inhibited (row, row->performance_inhibited);
+                           self, G_CONNECT_SWAPPED);
+  if (self->power_profile == CC_POWER_PROFILE_PERFORMANCE)
+    performance_profile_set_inhibited (self, self->performance_inhibited);
   gtk_box_pack_start (GTK_BOX (box), title, TRUE, TRUE, 0);
 }
 
@@ -314,45 +314,45 @@ cc_power_profile_row_class_init (CcPowerProfileRowClass *klass)
 }
 
 static void
-cc_power_profile_row_init (CcPowerProfileRow *row)
+cc_power_profile_row_init (CcPowerProfileRow *self)
 {
-  row->power_profile = -1;
+  self->power_profile = -1;
 }
 
 CcPowerProfile
-cc_power_profile_row_get_profile (CcPowerProfileRow *row)
+cc_power_profile_row_get_profile (CcPowerProfileRow *self)
 {
-  g_return_val_if_fail (CC_IS_POWER_PROFILE_ROW (row), -1);
+  g_return_val_if_fail (CC_IS_POWER_PROFILE_ROW (self), -1);
 
-  return row->power_profile;
+  return self->power_profile;
 }
 
 GtkRadioButton *
-cc_power_profile_row_get_radio_button (CcPowerProfileRow *row)
+cc_power_profile_row_get_radio_button (CcPowerProfileRow *self)
 {
-  g_return_val_if_fail (CC_IS_POWER_PROFILE_ROW (row), NULL);
+  g_return_val_if_fail (CC_IS_POWER_PROFILE_ROW (self), NULL);
 
-  return row->button;
+  return self->button;
 }
 
 void
-cc_power_profile_row_set_active (CcPowerProfileRow *row,
+cc_power_profile_row_set_active (CcPowerProfileRow *self,
                                  gboolean           active)
 {
-  g_return_if_fail (CC_IS_POWER_PROFILE_ROW (row));
+  g_return_if_fail (CC_IS_POWER_PROFILE_ROW (self));
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (row->button), active);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->button), active);
 }
 
 void
-cc_power_profile_row_set_performance_inhibited (CcPowerProfileRow *row,
+cc_power_profile_row_set_performance_inhibited (CcPowerProfileRow *self,
                                                 const char        *performance_inhibited)
 {
-  g_return_if_fail (CC_IS_POWER_PROFILE_ROW (row));
+  g_return_if_fail (CC_IS_POWER_PROFILE_ROW (self));
 
-  g_clear_pointer (&row->performance_inhibited, g_free);
-  row->performance_inhibited = g_strdup (performance_inhibited);
-  performance_profile_set_inhibited (row, row->performance_inhibited);
+  g_clear_pointer (&self->performance_inhibited, g_free);
+  self->performance_inhibited = g_strdup (performance_inhibited);
+  performance_profile_set_inhibited (self, self->performance_inhibited);
 }
 
 gboolean
diff --git a/panels/power/cc-power-profile-row.h b/panels/power/cc-power-profile-row.h
index 72b3df93f..c1fc16dea 100644
--- a/panels/power/cc-power-profile-row.h
+++ b/panels/power/cc-power-profile-row.h
@@ -44,7 +44,7 @@ GtkWidget *cc_power_profile_row_new                   (CcPowerProfile  power_pro
 CcPowerProfile cc_power_profile_row_get_profile       (CcPowerProfileRow *row);
 GtkRadioButton *cc_power_profile_row_get_radio_button (CcPowerProfileRow *row);
 void cc_power_profile_row_set_active                  (CcPowerProfileRow *row, gboolean active);
-gboolean cc_power_profile_row_get_active              (CcPowerProfileRow *self);
+gboolean cc_power_profile_row_get_active              (CcPowerProfileRow *row);
 void cc_power_profile_row_set_performance_inhibited   (CcPowerProfileRow *row,
                                                        const char        *performance_inhibited);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]