Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Object: Remove unused category boilerplate

Browse source 
We might want to re-add something like this if/when we find a good use case
for it and do the effort to categorize all objects in the API properly.

Until then, it's better to remove that boilerplate since it's not needed.

Closes #18711.
This commit is contained in:
Rémi Verschelde 2022-03-26 15:46:01 +01:00
parent fec2486994
commit 5371009d8e
19 changed files with 1 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/object/object.h
View file

@ -344,16 +344,6 @@ public:
m_inherits::get_inheritance_list_static(p_inheritance_list); \
p_inheritance_list->push_back(String(#m_class)); \
} \
static String get_category_static() { \
String category = m_inherits::get_category_static(); \
if (_get_category != m_inherits::_get_category) { \
if (!category.is_empty()) { \
category += "/"; \
} \
category += _get_category(); \
} \
return category; \
} \
virtual bool is_class(const String &p_class) const override { \
if (_get_extension() && _get_extension()->is_class(p_class)) { \
return true; \
@ -454,12 +444,6 @@ protected:
\
private:
#define OBJ_CATEGORY(m_category) \
protected: \
_FORCE_INLINE_ static String _get_category() { return m_category; } \
\
private:
#define OBJ_SAVE_TYPE(m_class) \
public: \
virtual String get_save_class() const override { return #m_class; } \
@ -590,7 +574,6 @@ protected:
virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const {};
virtual void _notificationv(int p_notification, bool p_reversed) {}
static String _get_category() { return ""; }
static void _bind_methods();
bool _set(const StringName &p_name, const Variant &p_property) { return false; };
bool _get(const StringName &p_name, Variant &r_property) const { return false; };
@ -694,7 +677,6 @@ public:
static String get_class_static() { return "Object"; }
static String get_parent_class_static() { return String(); }
static String get_category_static() { return String(); }
virtual String get_class() const {
if (_extension) {