diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2015-02-03 10:40:15 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2015-02-05 14:10:58 -0500 |
| commit | 4abfbb5e24991d37dde77c1a216388e43b0354e2 (patch) | |
| tree | 5a96d2f8a22b0b2456f625e30ce9caf828e9f6b6 | |
| parent | a67d12f309f14d0c9f3ad9860df00016b071b9d6 (diff) | |
| download | glib-wip/xclaesse/declare-iface.tar.gz | |
GListModel: Use G_DECLARE_INTERFACEwip/xclaesse/declare-iface
https://bugzilla.gnome.org/show_bug.cgi?id=743939
| -rw-r--r-- | gio/gio-autocleanups.h | 1 | ||||
| -rw-r--r-- | gio/glistmodel.h | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h index c3883830b..a3c0e043e 100644 --- a/gio/gio-autocleanups.h +++ b/gio/gio-autocleanups.h @@ -79,7 +79,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitable, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInputStream, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GIOModule, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GIOStream, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GListModel, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GLoadableIcon, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMemoryInputStream, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMemoryOutputStream, g_object_unref) diff --git a/gio/glistmodel.h b/gio/glistmodel.h index 8c0116088..bfd000199 100644 --- a/gio/glistmodel.h +++ b/gio/glistmodel.h @@ -31,12 +31,9 @@ G_BEGIN_DECLS -#define G_TYPE_LIST_MODEL (g_list_model_get_type ()) -#define G_LIST_MODEL(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), G_TYPE_LIST_MODEL, GListModel)) -#define G_IS_LIST_MODEL(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_LIST_MODEL)) -#define G_LIST_MODEL_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), G_TYPE_LIST_MODEL, GListModelInterface)) - -typedef struct _GListModelInterface GListModelInterface; +#define G_TYPE_LIST_MODEL g_list_model_get_type () +GLIB_AVAILABLE_IN_2_44 +G_DECLARE_INTERFACE(GListModel, g_list_model, G, LIST_MODEL, GObject) struct _GListModelInterface { @@ -51,9 +48,6 @@ struct _GListModelInterface }; GLIB_AVAILABLE_IN_2_44 -GType g_list_model_get_type (void) G_GNUC_CONST; - -GLIB_AVAILABLE_IN_2_44 GType g_list_model_get_item_type (GListModel *list); GLIB_AVAILABLE_IN_2_44 |