Browse Source

uniform resource name, _rtgui_type => _rtgui_object

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2134 bbd45198-f89e-11dd-88c7-29a3b14d5316
iamyhw@gmail.com 13 years ago
parent
commit
506a68edee

+ 1 - 1
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,

+ 2 - 2
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 */