diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-28 14:17:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 14:17:24 +0200 |
| commit | abbb0dc08245e14510fff9163449ff6ae65da1ba (patch) | |
| tree | c80d5dfb8a336de4b9556a2e928ce85e762a7063 /core/object | |
| parent | 41d075de5865c8b088c83219431661bc2d1f1802 (diff) | |
| parent | 5371009d8efbeee7b272b76de6534cad567fc60a (diff) | |
Merge pull request #59548 from akien-mga/obj-remove-unused-categories
Diffstat (limited to 'core/object')
| -rw-r--r-- | core/object/class_db.cpp | 9 | ||||
| -rw-r--r-- | core/object/class_db.h | 3 | ||||
| -rw-r--r-- | core/object/object.h | 18 |
3 files changed, 0 insertions, 30 deletions
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp index 51ca06d9d2..fd86a02b90 100644 --- a/core/object/class_db.cpp +++ b/core/object/class_db.cpp @@ -1556,15 +1556,6 @@ bool ClassDB::is_class_exposed(const StringName &p_class) { return ti->exposed; } -StringName ClassDB::get_category(const StringName &p_node) { - ERR_FAIL_COND_V(!classes.has(p_node), StringName()); -#ifdef DEBUG_ENABLED - return classes[p_node].category; -#else - return StringName(); -#endif -} - void ClassDB::add_resource_base_extension(const StringName &p_extension, const StringName &p_class) { if (resource_base_extensions.has(p_extension)) { return; diff --git a/core/object/class_db.h b/core/object/class_db.h index 4211601d15..b8a4b3ea2b 100644 --- a/core/object/class_db.h +++ b/core/object/class_db.h @@ -109,7 +109,6 @@ public: Set<StringName> methods_in_properties; List<MethodInfo> virtual_methods; Map<StringName, MethodInfo> virtual_methods_map; - StringName category; Map<StringName, Vector<Error>> method_error_values; #endif HashMap<StringName, PropertySetGet> property_setget; @@ -331,8 +330,6 @@ public: static Vector<Error> get_method_error_return_values(const StringName &p_class, const StringName &p_method); static Variant class_get_default_property_value(const StringName &p_class, const StringName &p_property, bool *r_valid = nullptr); - static StringName get_category(const StringName &p_node); - static void set_class_enabled(const StringName &p_class, bool p_enable); static bool is_class_enabled(const StringName &p_class); diff --git a/core/object/object.h b/core/object/object.h index 41365cfe51..dbaf9f13fd 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -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) { |