From 3b4b852b256b9191f326e406da468e8ac39f5868 Mon Sep 17 00:00:00 2001 From: barbieri Date: Wed, 15 Feb 2012 14:17:16 +0000 Subject: [PATCH] make tasn happier git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@67987 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/examples/eina_model_04_animal.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/examples/eina_model_04_animal.c b/src/examples/eina_model_04_animal.c index 8e5f71f..0f153c6 100644 --- a/src/examples/eina_model_04_animal.c +++ b/src/examples/eina_model_04_animal.c @@ -23,32 +23,30 @@ _animal_breathe(Eina_Model *mdl) } const char *ANIMAL_MODEL_TYPE_NAME = NULL; -static Animal_Type _ANIMAL_TYPE = { - EINA_MODEL_TYPE_INIT_NOPRIVATE("Animal_Model_Type", - Animal_Type, - NULL, - NULL, - NULL), - NULL, - NULL -}; +static Animal_Type _ANIMAL_TYPE; const Eina_Model_Type * const ANIMAL_TYPE = (Eina_Model_Type *) &_ANIMAL_TYPE; void animal_init(void) { + Eina_Model_Type *type; + if (initialized) return; initialized = EINA_TRUE; - ANIMAL_MODEL_TYPE_NAME = _ANIMAL_TYPE.parent_class.name; + ANIMAL_MODEL_TYPE_NAME = "Animal_Model_Type"; + + type = (Eina_Model_Type *)&_ANIMAL_TYPE; + type->version = EINA_MODEL_TYPE_VERSION; + type->name = ANIMAL_MODEL_TYPE_NAME; + type->private_size = 0; - eina_model_type_subclass_setup(&_ANIMAL_TYPE.parent_class, - EINA_MODEL_TYPE_GENERIC); + eina_model_type_subclass_setup(type, EINA_MODEL_TYPE_GENERIC); /* define extra methods */ - _ANIMAL_TYPE.parent_class.type_size = sizeof(Animal_Type); + type->type_size = sizeof(Animal_Type); _ANIMAL_TYPE.breathe = _animal_breathe; _ANIMAL_TYPE.eat = _animal_eat; } -- 2.7.4