浏览代码

Merge pull request #94068 from dalexeev/core-remove-is-gpl-reversed

Core: Remove unused method `_is_gpl_reversed()`
Rémi Verschelde 1 年之前
父节点
当前提交
3e8d051a4a
共有 1 个文件被更改,包括 1 次插入20 次删除
  1. 1 20
      core/object/object.h

+ 1 - 20
core/object/object.h

@@ -387,18 +387,6 @@ struct ObjectGDExtension {
  * much alone defines the object model.
  * much alone defines the object model.
  */
  */
 
 
-#define REVERSE_GET_PROPERTY_LIST                                  \
-public:                                                            \
-	_FORCE_INLINE_ bool _is_gpl_reversed() const { return true; }; \
-                                                                   \
-private:
-
-#define UNREVERSE_GET_PROPERTY_LIST                                 \
-public:                                                             \
-	_FORCE_INLINE_ bool _is_gpl_reversed() const { return false; }; \
-                                                                    \
-private:
-
 #define GDCLASS(m_class, m_inherits)                                                                                                             \
 #define GDCLASS(m_class, m_inherits)                                                                                                             \
 private:                                                                                                                                         \
 private:                                                                                                                                         \
 	void operator=(const m_class &p_rval) {}                                                                                                     \
 	void operator=(const m_class &p_rval) {}                                                                                                     \
@@ -510,15 +498,10 @@ protected:
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
 		}                                                                                                                                        \
 		}                                                                                                                                        \
 		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, get_class_static(), PROPERTY_USAGE_CATEGORY));      \
 		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, get_class_static(), PROPERTY_USAGE_CATEGORY));      \
-		if (!_is_gpl_reversed()) {                                                                                                               \
-			::ClassDB::get_property_list(#m_class, p_list, true, this);                                                                          \
-		}                                                                                                                                        \
+		::ClassDB::get_property_list(#m_class, p_list, true, this);                                                                              \
 		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                         \
 		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                         \
 			_get_property_list(p_list);                                                                                                          \
 			_get_property_list(p_list);                                                                                                          \
 		}                                                                                                                                        \
 		}                                                                                                                                        \
-		if (_is_gpl_reversed()) {                                                                                                                \
-			::ClassDB::get_property_list(#m_class, p_list, true, this);                                                                          \
-		}                                                                                                                                        \
 		if (p_reversed) {                                                                                                                        \
 		if (p_reversed) {                                                                                                                        \
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                                 \
 		}                                                                                                                                        \
 		}                                                                                                                                        \
@@ -799,8 +782,6 @@ public:
 		return &ptr;
 		return &ptr;
 	}
 	}
 
 
-	bool _is_gpl_reversed() const { return false; }
-
 	void detach_from_objectdb();
 	void detach_from_objectdb();
 	_FORCE_INLINE_ ObjectID get_instance_id() const { return _instance_id; }
 	_FORCE_INLINE_ ObjectID get_instance_id() const { return _instance_id; }