Revision ac451033 qom/object.c
b/qom/object.c | ||
---|---|---|
206 | 206 |
g_free(name); |
207 | 207 |
} |
208 | 208 |
|
209 |
static void type_class_init(TypeImpl *ti)
|
|
209 |
static void type_initialize(TypeImpl *ti)
|
|
210 | 210 |
{ |
211 | 211 |
size_t class_size = sizeof(ObjectClass); |
212 | 212 |
int i; |
... | ... | |
224 | 224 |
if (type_has_parent(ti)) { |
225 | 225 |
TypeImpl *parent = type_get_parent(ti); |
226 | 226 |
|
227 |
type_class_init(parent);
|
|
227 |
type_initialize(parent);
|
|
228 | 228 |
|
229 | 229 |
class_size = parent->class_size; |
230 | 230 |
g_assert(parent->class_size <= ti->class_size); |
... | ... | |
278 | 278 |
Object *obj = data; |
279 | 279 |
|
280 | 280 |
g_assert(type != NULL); |
281 |
type_class_init(type);
|
|
281 |
type_initialize(type);
|
|
282 | 282 |
|
283 | 283 |
g_assert(type->instance_size >= sizeof(Object)); |
284 | 284 |
g_assert(type->abstract == false); |
... | ... | |
367 | 367 |
Object *obj; |
368 | 368 |
|
369 | 369 |
g_assert(type != NULL); |
370 |
type_class_init(type);
|
|
370 |
type_initialize(type);
|
|
371 | 371 |
|
372 | 372 |
obj = g_malloc(type->instance_size); |
373 | 373 |
object_initialize_with_type(obj, type); |
... | ... | |
540 | 540 |
return NULL; |
541 | 541 |
} |
542 | 542 |
|
543 |
type_class_init(type);
|
|
543 |
type_initialize(type);
|
|
544 | 544 |
|
545 | 545 |
return type->class; |
546 | 546 |
} |
... | ... | |
560 | 560 |
TypeImpl *type = value; |
561 | 561 |
ObjectClass *k; |
562 | 562 |
|
563 |
type_class_init(type);
|
|
563 |
type_initialize(type);
|
|
564 | 564 |
k = type->class; |
565 | 565 |
|
566 | 566 |
if (!data->include_abstract && type->abstract) { |
Also available in: Unified diff