[libadwaita/wip/exalm/value-objects: 7/9] enum-list-model: Rename AdwEnumValueObject to AdwEnumListItem

[Alexander Mikhaylenko <alexm src gnome org>]

commit ad09941a6ae45f41688fcdd540aafc499881dc2b
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Aug 31 14:06:47 2021 +0500

    enum-list-model: Rename AdwEnumValueObject to AdwEnumListItem
    
    At this point it makes no sense to keep the old name.

 examples/adw-demo-window.c      | 16 ++++------
 examples/adw-demo-window.ui     |  2 +-
 examples/adw-flap-demo-window.c | 16 ++++------
 src/adw-enum-list-model.c       | 70 ++++++++++++++++++++---------------------
 src/adw-enum-list-model.h       | 10 +++---
 tests/test-combo-row.c          | 16 +++++-----
 6 files changed, 61 insertions(+), 69 deletions(-)
---
diff --git a/examples/adw-demo-window.c b/examples/adw-demo-window.c
index 01fbc7b8..f48c9db7 100644
--- a/examples/adw-demo-window.c
+++ b/examples/adw-demo-window.c
@@ -77,12 +77,10 @@ leaflet_back_clicked_cb (GtkWidget     *sender,
 }
 
 static char *
-leaflet_transition_name (AdwEnumValueObject *value,
-                         gpointer            user_data)
+leaflet_transition_name (AdwEnumListItem *item,
+                         gpointer         user_data)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (value), NULL);
-
-  switch (adw_enum_value_object_get_value (value)) {
+  switch (adw_enum_list_item_get_value (item)) {
   case ADW_LEAFLET_TRANSITION_TYPE_OVER:
     return g_strdup (_("Over"));
   case ADW_LEAFLET_TRANSITION_TYPE_UNDER:
@@ -126,12 +124,10 @@ view_switcher_demo_clicked_cb (GtkButton     *btn,
 }
 
 static char *
-carousel_orientation_name (AdwEnumValueObject *value,
-                           gpointer            user_data)
+carousel_orientation_name (AdwEnumListItem *item,
+                           gpointer         user_data)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (value), NULL);
-
-  switch (adw_enum_value_object_get_value (value)) {
+  switch (adw_enum_list_item_get_value (item)) {
   case GTK_ORIENTATION_HORIZONTAL:
     return g_strdup (_("Horizontal"));
   case GTK_ORIENTATION_VERTICAL:
diff --git a/examples/adw-demo-window.ui b/examples/adw-demo-window.ui
index f2fd2f14..42b26f61 100644
--- a/examples/adw-demo-window.ui
+++ b/examples/adw-demo-window.ui
@@ -295,7 +295,7 @@
                                           </object>
                                         </property>
                                         <property name="expression">
-                                          <lookup type="AdwEnumValueObject" name="nick"/>
+                                          <lookup type="AdwEnumListItem" name="nick"/>
                                         </property>
                                       </object>
                                     </child>
diff --git a/examples/adw-flap-demo-window.c b/examples/adw-flap-demo-window.c
index fb7833e8..0087d0bf 100644
--- a/examples/adw-flap-demo-window.c
+++ b/examples/adw-flap-demo-window.c
@@ -14,12 +14,10 @@ struct _AdwFlapDemoWindow
 G_DEFINE_TYPE (AdwFlapDemoWindow, adw_flap_demo_window, ADW_TYPE_WINDOW)
 
 static char *
-fold_policy_name (AdwEnumValueObject *value,
-                  gpointer            user_data)
+fold_policy_name (AdwEnumListItem *item,
+                  gpointer         user_data)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (value), NULL);
-
-  switch (adw_enum_value_object_get_value (value)) {
+  switch (adw_enum_list_item_get_value (item)) {
   case ADW_FLAP_FOLD_POLICY_NEVER:
     return g_strdup (_("Never"));
   case ADW_FLAP_FOLD_POLICY_ALWAYS:
@@ -32,12 +30,10 @@ fold_policy_name (AdwEnumValueObject *value,
 }
 
 static char *
-transition_type_name (AdwEnumValueObject *value,
-                      gpointer            user_data)
+transition_type_name (AdwEnumListItem *item,
+                      gpointer         user_data)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (value), NULL);
-
-  switch (adw_enum_value_object_get_value (value)) {
+  switch (adw_enum_list_item_get_value (item)) {
   case ADW_FLAP_TRANSITION_TYPE_OVER:
     return g_strdup (_("Over"));
   case ADW_FLAP_TRANSITION_TYPE_UNDER:
diff --git a/src/adw-enum-list-model.c b/src/adw-enum-list-model.c
index 21403603..f309cfd5 100644
--- a/src/adw-enum-list-model.c
+++ b/src/adw-enum-list-model.c
@@ -15,7 +15,7 @@
  *
  * A `GListModel` representing values of a given enum.
  *
- * `AdwEnumListModel` contains objects of type [class@AdwEnumValueObject].
+ * `AdwEnumListModel` contains objects of type [class@AdwEnumListItem].
  *
  * Since: 1.0
  */
@@ -27,7 +27,7 @@ struct _AdwEnumListModel
   GType enum_type;
   GEnumClass *enum_class;
 
-  AdwEnumValueObject **objects;
+  AdwEnumListItem **objects;
 };
 
 enum {
@@ -44,14 +44,14 @@ G_DEFINE_TYPE_WITH_CODE (AdwEnumListModel, adw_enum_list_model, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, adw_enum_list_model_list_model_init))
 
 /**
- * AdwEnumValueObject:
+ * AdwEnumListItem:
  *
- * `AdwEnumValueObject` is the type of items in a [class@Adw.EnumListModel].
+ * `AdwEnumListItem` is the type of items in a [class@Adw.EnumListModel].
  *
  * Since: 1.0
  */
 
-struct _AdwEnumValueObject
+struct _AdwEnumListItem
 {
   GObject parent_instance;
 
@@ -68,25 +68,25 @@ enum {
 
 static GParamSpec *value_props[LAST_VALUE_PROP];
 
-G_DEFINE_TYPE (AdwEnumValueObject, adw_enum_value_object, G_TYPE_OBJECT)
+G_DEFINE_TYPE (AdwEnumListItem, adw_enum_list_item, G_TYPE_OBJECT)
 
 static void
-adw_enum_value_object_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
+adw_enum_list_item_get_property (GObject    *object,
+                                 guint       prop_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
 {
-  AdwEnumValueObject *self = ADW_ENUM_VALUE_OBJECT (object);
+  AdwEnumListItem *self = ADW_ENUM_LIST_ITEM (object);
 
   switch (prop_id) {
   case VALUE_PROP_VALUE:
-    g_value_set_int (value, adw_enum_value_object_get_value (self));
+    g_value_set_int (value, adw_enum_list_item_get_value (self));
     break;
   case VALUE_PROP_NAME:
-    g_value_set_string (value, adw_enum_value_object_get_name (self));
+    g_value_set_string (value, adw_enum_list_item_get_name (self));
     break;
   case VALUE_PROP_NICK:
-    g_value_set_string (value, adw_enum_value_object_get_nick (self));
+    g_value_set_string (value, adw_enum_list_item_get_nick (self));
     break;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -94,14 +94,14 @@ adw_enum_value_object_get_property (GObject    *object,
 }
 
 static void
-adw_enum_value_object_class_init (AdwEnumValueObjectClass *klass)
+adw_enum_list_item_class_init (AdwEnumListItemClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->get_property = adw_enum_value_object_get_property;
+  object_class->get_property = adw_enum_list_item_get_property;
 
   /**
-   * AdwEnumValueObject:value: (attributes org.gtk.Property.get=adw_enum_value_object_get_value)
+   * AdwEnumListItem:value: (attributes org.gtk.Property.get=adw_enum_list_item_get_value)
    *
    * The enum value.
    *
@@ -115,7 +115,7 @@ adw_enum_value_object_class_init (AdwEnumValueObjectClass *klass)
                       G_PARAM_READABLE);
 
   /**
-   * AdwEnumValueObject:name: (attributes org.gtk.Property.get=adw_enum_value_object_get_name)
+   * AdwEnumListItem:name: (attributes org.gtk.Property.get=adw_enum_list_item_get_name)
    *
    * The enum value name.
    *
@@ -129,7 +129,7 @@ adw_enum_value_object_class_init (AdwEnumValueObjectClass *klass)
                          G_PARAM_READABLE);
 
   /**
-   * AdwEnumValueObject:nick: (attributes org.gtk.Property.get=adw_enum_value_object_get_nick)
+   * AdwEnumListItem:nick: (attributes org.gtk.Property.get=adw_enum_list_item_get_nick)
    *
    * The enum value nick.
    *
@@ -146,14 +146,14 @@ adw_enum_value_object_class_init (AdwEnumValueObjectClass *klass)
 }
 
 static void
-adw_enum_value_object_init (AdwEnumValueObject *self)
+adw_enum_list_item_init (AdwEnumListItem *self)
 {
 }
 
-static AdwEnumValueObject *
-adw_enum_value_object_new (GEnumValue *enum_value)
+static AdwEnumListItem *
+adw_enum_list_item_new (GEnumValue *enum_value)
 {
-  AdwEnumValueObject *self = g_object_new (ADW_TYPE_ENUM_VALUE_OBJECT, NULL);
+  AdwEnumListItem *self = g_object_new (ADW_TYPE_ENUM_LIST_ITEM, NULL);
 
   self->enum_value = *enum_value;
 
@@ -161,7 +161,7 @@ adw_enum_value_object_new (GEnumValue *enum_value)
 }
 
 /**
- * adw_enum_value_object_get_value: (attributes org.gtk.Method.get_property=value)
+ * adw_enum_list_item_get_value: (attributes org.gtk.Method.get_property=value)
  *
  * Gets the enum value.
  *
@@ -170,15 +170,15 @@ adw_enum_value_object_new (GEnumValue *enum_value)
  * Since: 1.0
  */
 int
-adw_enum_value_object_get_value (AdwEnumValueObject *self)
+adw_enum_list_item_get_value (AdwEnumListItem *self)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (self), 0);
+  g_return_val_if_fail (ADW_IS_ENUM_LIST_ITEM (self), 0);
 
   return self->enum_value.value;
 }
 
 /**
- * adw_enum_value_object_get_name: (attributes org.gtk.Method.get_property=name)
+ * adw_enum_list_item_get_name: (attributes org.gtk.Method.get_property=name)
  *
  * Gets the enum value name.
  *
@@ -187,15 +187,15 @@ adw_enum_value_object_get_value (AdwEnumValueObject *self)
  * Since: 1.0
  */
 const char *
-adw_enum_value_object_get_name (AdwEnumValueObject *self)
+adw_enum_list_item_get_name (AdwEnumListItem *self)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (self), NULL);
+  g_return_val_if_fail (ADW_IS_ENUM_LIST_ITEM (self), NULL);
 
   return self->enum_value.value_name;
 }
 
 /**
- * adw_enum_value_object_get_nick: (attributes org.gtk.Method.get_property=nick)
+ * adw_enum_list_item_get_nick: (attributes org.gtk.Method.get_property=nick)
  *
  * Gets the enum value nick.
  *
@@ -204,9 +204,9 @@ adw_enum_value_object_get_name (AdwEnumValueObject *self)
  * Since: 1.0
  */
 const char *
-adw_enum_value_object_get_nick (AdwEnumValueObject *self)
+adw_enum_list_item_get_nick (AdwEnumListItem *self)
 {
-  g_return_val_if_fail (ADW_IS_ENUM_VALUE_OBJECT (self), NULL);
+  g_return_val_if_fail (ADW_IS_ENUM_LIST_ITEM (self), NULL);
 
   return self->enum_value.value_nick;
 }
@@ -219,10 +219,10 @@ adw_enum_list_model_constructed (GObject *object)
 
   self->enum_class = g_type_class_ref (self->enum_type);
 
-  self->objects = g_new0 (AdwEnumValueObject *, self->enum_class->n_values);
+  self->objects = g_new0 (AdwEnumListItem *, self->enum_class->n_values);
 
   for (i = 0; i < self->enum_class->n_values; i++)
-    self->objects[i] = adw_enum_value_object_new (&self->enum_class->values[i]);
+    self->objects[i] = adw_enum_list_item_new (&self->enum_class->values[i]);
 
   G_OBJECT_CLASS (adw_enum_list_model_parent_class)->constructed (object);
 }
@@ -307,7 +307,7 @@ adw_enum_list_model_init (AdwEnumListModel *self)
 static GType
 adw_enum_list_model_get_item_type (GListModel *list)
 {
-  return ADW_TYPE_ENUM_VALUE_OBJECT;
+  return ADW_TYPE_ENUM_LIST_ITEM;
 }
 
 static guint
diff --git a/src/adw-enum-list-model.h b/src/adw-enum-list-model.h
index c32828b8..3e30eb9f 100644
--- a/src/adw-enum-list-model.h
+++ b/src/adw-enum-list-model.h
@@ -16,19 +16,19 @@
 
 G_BEGIN_DECLS
 
-#define ADW_TYPE_ENUM_VALUE_OBJECT (adw_enum_value_object_get_type())
+#define ADW_TYPE_ENUM_LIST_ITEM (adw_enum_list_item_get_type())
 
 ADW_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (AdwEnumValueObject, adw_enum_value_object, ADW, ENUM_VALUE_OBJECT, GObject)
+G_DECLARE_FINAL_TYPE (AdwEnumListItem, adw_enum_list_item, ADW, ENUM_LIST_ITEM, GObject)
 
 ADW_AVAILABLE_IN_ALL
-int adw_enum_value_object_get_value (AdwEnumValueObject *self);
+int adw_enum_list_item_get_value (AdwEnumListItem *self);
 
 ADW_AVAILABLE_IN_ALL
-const char *adw_enum_value_object_get_name (AdwEnumValueObject *self);
+const char *adw_enum_list_item_get_name (AdwEnumListItem *self);
 
 ADW_AVAILABLE_IN_ALL
-const char *adw_enum_value_object_get_nick (AdwEnumValueObject *self);
+const char *adw_enum_list_item_get_nick (AdwEnumListItem *self);
 
 #define ADW_TYPE_ENUM_LIST_MODEL (adw_enum_list_model_get_type())
 
diff --git a/tests/test-combo-row.c b/tests/test-combo-row.c
index 9acd1364..2c7cc819 100644
--- a/tests/test-combo-row.c
+++ b/tests/test-combo-row.c
@@ -20,14 +20,14 @@ test_adw_combo_row_set_for_enum (void)
   g_autoptr (AdwComboRow) row = NULL;
   GtkExpression *expr = NULL;
   GListModel *model;
-  AdwEnumValueObject *value;
+  AdwEnumListItem *item;
 
   row = g_object_ref_sink (ADW_COMBO_ROW (adw_combo_row_new ()));
   g_assert_nonnull (row);
 
   g_assert_null (adw_combo_row_get_model (row));
 
-  expr = gtk_property_expression_new (ADW_TYPE_ENUM_VALUE_OBJECT, NULL, "nick");
+  expr = gtk_property_expression_new (ADW_TYPE_ENUM_LIST_ITEM, NULL, "nick");
   adw_combo_row_set_expression (row, expr);
   gtk_expression_unref (expr);
 
@@ -40,13 +40,13 @@ test_adw_combo_row_set_for_enum (void)
 
   g_assert_cmpuint (g_list_model_get_n_items (model), ==, 2);
 
-  value = g_list_model_get_item (model, 0);
-  g_assert_true (ADW_IS_ENUM_VALUE_OBJECT (value));
-  g_assert_cmpstr (adw_enum_value_object_get_nick (value), ==, "horizontal");
+  item = g_list_model_get_item (model, 0);
+  g_assert_true (ADW_IS_ENUM_LIST_ITEM (item));
+  g_assert_cmpstr (adw_enum_list_item_get_nick (item), ==, "horizontal");
 
-  value = g_list_model_get_item (model, 1);
-  g_assert_true (ADW_IS_ENUM_VALUE_OBJECT (value));
-  g_assert_cmpstr (adw_enum_value_object_get_nick (value), ==, "vertical");
+  item = g_list_model_get_item (model, 1);
+  g_assert_true (ADW_IS_ENUM_LIST_ITEM (item));
+  g_assert_cmpstr (adw_enum_list_item_get_nick (item), ==, "vertical");
 }
 
 static void