[gtk/wip/otte/whatever: 104/105] listmodels: Stop respecting item-type
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/whatever: 104/105] listmodels: Stop respecting item-type
- Date: Mon, 6 Jul 2020 00:55:00 +0000 (UTC)
commit b51bfae6d849642119717cd4d4314f8904d295d8
Author: Benjamin Otte <otte redhat com>
Date: Sat Jul 4 21:47:48 2020 +0200
listmodels: Stop respecting item-type
Simplify all view model APIs and always return G_TYPE_OBJECT as the
item-type for every model.
It turns out nobody uses item-type anyway.
So instead of adding lots of APIs, forcing people to think about it and
trying to figure out how to handle filter or map models that modify item
types, just having an easy life is a better approach.
All the models need to be able to deal with any type of object going
through anyway.
gtk/gtkarraystore.c | 72 +++--------------------------------------------------
gtk/gtkarraystore.h | 2 +-
2 files changed, 4 insertions(+), 70 deletions(-)
---
diff --git a/gtk/gtkarraystore.c b/gtk/gtkarraystore.c
index fd6528f349..6c6fcb2081 100644
--- a/gtk/gtkarraystore.c
+++ b/gtk/gtkarraystore.c
@@ -48,17 +48,9 @@ struct _GtkArrayStore
{
GObject parent_instance;
- GType item_type;
GtkVector items;
};
-enum
-{
- PROP_0,
- PROP_ITEM_TYPE,
- N_PROPERTIES
-};
-
static void gtk_array_store_iface_init (GListModelInterface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkArrayStore, gtk_array_store, G_TYPE_OBJECT,
@@ -74,71 +66,18 @@ gtk_array_store_dispose (GObject *object)
G_OBJECT_CLASS (gtk_array_store_parent_class)->dispose (object);
}
-static void
-gtk_array_store_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtkArrayStore *self = GTK_ARRAY_STORE (object);
-
- switch (property_id)
- {
- case PROP_ITEM_TYPE:
- g_value_set_gtype (value, self->item_type);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- }
-}
-
-static void
-gtk_array_store_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtkArrayStore *self = GTK_ARRAY_STORE (object);
-
- switch (property_id)
- {
- case PROP_ITEM_TYPE: /* construct-only */
- g_assert (g_type_is_a (g_value_get_gtype (value), G_TYPE_OBJECT));
- self->item_type = g_value_get_gtype (value);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- }
-}
-
static void
gtk_array_store_class_init (GtkArrayStoreClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = gtk_array_store_dispose;
- object_class->get_property = gtk_array_store_get_property;
- object_class->set_property = gtk_array_store_set_property;
-
- /**
- * GtkArrayStore:item-type:
- *
- * The type of items contained in this list self. Items must be
- * subclasses of #GObject.
- **/
- g_object_class_install_property (object_class, PROP_ITEM_TYPE,
- g_param_spec_gtype ("item-type", "", "", G_TYPE_OBJECT,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
static GType
gtk_array_store_get_item_type (GListModel *list)
{
- GtkArrayStore *self = GTK_ARRAY_STORE (list);
-
- return self->item_type;
+ return G_TYPE_OBJECT;
}
static guint
@@ -185,13 +124,9 @@ gtk_array_store_init (GtkArrayStore *self)
* Returns: a new #GtkArrayStore
*/
GtkArrayStore *
-gtk_array_store_new (GType item_type)
+gtk_array_store_new (void)
{
- g_return_val_if_fail (g_type_is_a (item_type, G_TYPE_OBJECT), NULL);
-
- return g_object_new (GTK_TYPE_ARRAY_STORE,
- "item-type", item_type,
- NULL);
+ return g_object_new (GTK_TYPE_ARRAY_STORE, NULL);
}
/**
@@ -213,7 +148,6 @@ gtk_array_store_append (GtkArrayStore *self,
guint position;
g_return_if_fail (GTK_IS_ARRAY_STORE (self));
- g_return_if_fail (g_type_is_a (G_OBJECT_TYPE (item), self->item_type));
position = gtk_vector_get_size (&self->items);
gtk_vector_append (&self->items, g_object_ref (item));
diff --git a/gtk/gtkarraystore.h b/gtk/gtkarraystore.h
index 7f35d07e4d..d2a18eadd4 100644
--- a/gtk/gtkarraystore.h
+++ b/gtk/gtkarraystore.h
@@ -33,7 +33,7 @@ GDK_AVAILABLE_IN_ALL
G_DECLARE_FINAL_TYPE(GtkArrayStore, gtk_array_store, GTK, ARRAY_STORE, GObject)
GDK_AVAILABLE_IN_ALL
-GtkArrayStore * gtk_array_store_new (GType item_type);
+GtkArrayStore * gtk_array_store_new (void);
GDK_AVAILABLE_IN_ALL
void gtk_array_store_append (GtkArrayStore *store,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]