diff options
| author | [email protected] <[email protected]> | 2012-05-29 00:46:09 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-05-29 00:46:09 +0000 |
| commit | 506a68edee6f11ca39495df3de33ef57fb279527 (patch) | |
| tree | b32ea6a3805ee3d3940d37b9bc23632bf62caf3d /components | |
| parent | b20311198a273161ac1476c865110879ddbe4e57 (diff) | |
uniform resource name, _rtgui_type => _rtgui_object
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2134 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components')
| -rw-r--r-- | components/rtgui/common/rtgui_object.c | 2 | ||||
| -rw-r--r-- | components/rtgui/include/rtgui/rtgui_object.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/rtgui/common/rtgui_object.c b/components/rtgui/common/rtgui_object.c index a4248cfb29..1ee7c1cb10 100644 --- a/components/rtgui/common/rtgui_object.c +++ b/components/rtgui/common/rtgui_object.c @@ -29,7 +29,7 @@ static void _rtgui_object_destructor(rtgui_object_t *object) /* nothing */ } -DEFINE_CLASS_TYPE(type, "object", +DEFINE_CLASS_TYPE(object, "object", RT_NULL, _rtgui_object_constructor, _rtgui_object_destructor, diff --git a/components/rtgui/include/rtgui/rtgui_object.h b/components/rtgui/include/rtgui/rtgui_object.h index f89bfbf1b2..84d163192e 100644 --- a/components/rtgui/include/rtgui/rtgui_object.h +++ b/components/rtgui/include/rtgui/rtgui_object.h @@ -82,9 +82,9 @@ const rtgui_type_t *rtgui_object_object_type_get(rtgui_object_t *object); #define RTGUI_OBJECT_CHECK_TYPE(_obj, _type) \ (rtgui_type_inherits_from(((rtgui_object_t *)(_obj))->type, (_type))) -DECLARE_CLASS_TYPE(type); +DECLARE_CLASS_TYPE(object); /** Gets the type of an object */ -#define RTGUI_OBJECT_TYPE RTGUI_TYPE(type) +#define RTGUI_OBJECT_TYPE RTGUI_TYPE(object) /** Casts the object to an rtgui_object_t */ #define RTGUI_OBJECT(obj) (RTGUI_OBJECT_CAST((obj), RTGUI_OBJECT_TYPE, struct rtgui_object)) /** Checks if the object is an rtgui_Object */ |