diff --git a/clutter/clutter-list-model.c b/clutter/clutter-list-model.c index b1dec9b84..d717bf257 100644 --- a/clutter/clutter-list-model.c +++ b/clutter/clutter-list-model.c @@ -35,6 +35,9 @@ * in sorted lists. * * #ClutterListModel is available since Clutter 0.6 + * + * Deprecated: 1.24: Use a #GListStore instance containing a custom + * object type with properties for each column instead. */ #ifdef HAVE_CONFIG_H @@ -46,9 +49,11 @@ #include +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS +#include "clutter-list-model.h" + #include "clutter-model.h" #include "clutter-model-private.h" -#include "clutter-list-model.h" #include "clutter-private.h" #include "clutter-debug.h" @@ -746,6 +751,8 @@ clutter_list_model_init (ClutterListModel *model) * Return value: a new #ClutterListModel * * Since: 0.6 + * + * Deprecated: 1.24: Use #GListStore instead */ ClutterModel * clutter_list_model_new (guint n_columns, @@ -796,6 +803,8 @@ clutter_list_model_new (guint n_columns, * Return value: (transfer full): a new default #ClutterModel * * Since: 0.6 + * + * Deprecated: 1.24: Use #GListStore instead */ ClutterModel * clutter_list_model_newv (guint n_columns, diff --git a/clutter/clutter-list-model.h b/clutter/clutter-list-model.h index ed52823fb..e8579899c 100644 --- a/clutter/clutter-list-model.h +++ b/clutter/clutter-list-model.h @@ -53,6 +53,8 @@ typedef struct _ClutterListModelClass ClutterListModelClass; * The #ClutterListModel struct contains only private data. * * Since: 0.6 + * + * Deprecated: 1.24: Use #GListStore instead */ struct _ClutterListModel { @@ -68,6 +70,8 @@ struct _ClutterListModel * The #ClutterListModelClass struct contains only private data. * * Since: 0.6 + * + * Deprecated: 1.24: Use #GListStore instead */ struct _ClutterListModelClass { @@ -75,13 +79,13 @@ struct _ClutterListModelClass ClutterModelClass parent_class; }; -CLUTTER_AVAILABLE_IN_ALL +CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_get_type) GType clutter_list_model_get_type (void) G_GNUC_CONST; -CLUTTER_AVAILABLE_IN_ALL +CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new) ClutterModel *clutter_list_model_new (guint n_columns, ...); -CLUTTER_AVAILABLE_IN_ALL +CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new) ClutterModel *clutter_list_model_newv (guint n_columns, GType *types, const gchar * const names[]);