1 files changed, 48 insertions, 10 deletions

diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 968e7f92c7..9a4f26a12d 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -38,7 +38,7 @@
 
 
 class _ResourceLoader : public Object  {
-	OBJ_TYPE(_ResourceLoader,Object);
+	GDCLASS(_ResourceLoader,Object);
 
 protected:
 
@@ -60,7 +60,7 @@ public:
 };
 
 class _ResourceSaver : public Object  {
-	OBJ_TYPE(_ResourceSaver,Object);
+	GDCLASS(_ResourceSaver,Object);
 
 protected:
 
@@ -90,7 +90,7 @@ public:
 class MainLoop;
 
 class _OS : public Object  {
-	OBJ_TYPE(_OS,Object);
+	GDCLASS(_OS,Object);
 
 protected:
 
@@ -333,7 +333,7 @@ VARIANT_ENUM_CAST(_OS::ScreenOrientation);
 
 class _Geometry : public Object {
 
-	OBJ_TYPE(_Geometry, Object);
+	GDCLASS(_Geometry, Object);
 
 	static _Geometry *singleton;
 protected:
@@ -371,7 +371,7 @@ public:
 
 class _File : public Reference {
 
-	OBJ_TYPE(_File,Reference);
+	GDCLASS(_File,Reference);
 	FileAccess *f;
 	bool eswap;
 protected:
@@ -460,7 +460,7 @@ public:
 
 class _Directory : public Reference {
 
-	OBJ_TYPE(_Directory,Reference);
+	GDCLASS(_Directory,Reference);
 	DirAccess *d;
 protected:
 
@@ -501,7 +501,7 @@ public:
 
 class _Marshalls : public Reference {
 
-	OBJ_TYPE(_Marshalls,Reference);
+	GDCLASS(_Marshalls,Reference);
 
 	static _Marshalls* singleton;
 
@@ -530,7 +530,7 @@ public:
 
 class _Mutex : public Reference {
 
-	OBJ_TYPE(_Mutex,Reference);
+	GDCLASS(_Mutex,Reference);
 	Mutex *mutex;
 
 	static void _bind_methods();
@@ -546,7 +546,7 @@ public:
 
 class _Semaphore : public Reference {
 
-	OBJ_TYPE(_Semaphore,Reference);
+	GDCLASS(_Semaphore,Reference);
 	Semaphore *semaphore;
 
 	static void _bind_methods();
@@ -561,7 +561,7 @@ public:
 
 class _Thread : public Reference {
 
-	OBJ_TYPE(_Thread,Reference);
+	GDCLASS(_Thread,Reference);
 
 protected:
 
@@ -591,4 +591,42 @@ public:
 	~_Thread();
 };
 
+class _ClassDB : public Object {
+
+	GDCLASS(_ClassDB,Object)
+
+protected:
+	static void _bind_methods();
+public:
+
+	StringArray get_class_list() const;
+	StringArray get_inheriters_from_class( const StringName& p_class) const;
+	StringName get_parent_class(const StringName& p_class) const;
+	bool class_exists(const StringName &p_class) const;
+	bool is_parent_class(const StringName &p_class,const StringName& p_inherits) const;
+	bool can_instance(const StringName &p_class) const;
+	Variant instance(const StringName &p_class) const;
+
+	bool has_signal(StringName p_class,StringName p_signal) const;
+	Dictionary get_signal(StringName p_class,StringName p_signal) const;
+	Array get_signal_list(StringName p_class,bool p_no_inheritance=false) const;
+
+	Array get_property_list(StringName p_class, bool p_no_inheritance=false) const;
+
+	bool has_method(StringName p_class,StringName p_method,bool p_no_inheritance=false) const;
+
+
+	Array get_method_list(StringName p_class,bool p_no_inheritance=false) const;
+
+	StringArray get_integer_constant_list(const StringName& p_class, bool p_no_inheritance=false) const;
+	bool has_integer_constant(const StringName& p_class, const StringName &p_name) const;
+	int get_integer_constant(const StringName& p_class, const StringName &p_name) const;
+	StringName get_category(const StringName& p_node) const;
+
+	bool is_class_enabled(StringName p_class) const;
+
+	_ClassDB();
+	~_ClassDB();
+};
+
 #endif // CORE_BIND_H