From b7750c1a5b0025ef44c54c6306f6402fa79cead3 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 15 Feb 2012 14:17:16 +0000 Subject: [PATCH] make tasn happier SVN revision: 67987 --- .../eina/src/examples/eina_model_04_animal.c | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/legacy/eina/src/examples/eina_model_04_animal.c b/legacy/eina/src/examples/eina_model_04_animal.c index 8e5f71f1f7..0f153c687e 100644 --- a/legacy/eina/src/examples/eina_model_04_animal.c +++ b/legacy/eina/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"; - eina_model_type_subclass_setup(&_ANIMAL_TYPE.parent_class, - EINA_MODEL_TYPE_GENERIC); + 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(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; }