diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-09-02 10:41:24 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2022-09-14 08:41:09 +0300 |
| commit | 36273baa7e6210d9e353144442d2699659eb1684 (patch) | |
| tree | 67146b71219b43f544d9707bdaf5cc41fe960609 /include/godot_cpp/classes | |
| parent | 420c86eb90f13194b26e8a28d8173d22bd9d064f (diff) | |
| download | redot-cpp-36273baa7e6210d9e353144442d2699659eb1684.tar.gz | |
Change PropertyInfo members to String.
Diffstat (limited to 'include/godot_cpp/classes')
| -rw-r--r-- | include/godot_cpp/classes/ref.hpp | 12 | ||||
| -rw-r--r-- | include/godot_cpp/classes/wrapped.hpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/godot_cpp/classes/ref.hpp b/include/godot_cpp/classes/ref.hpp index 671551f..0e65f48 100644 --- a/include/godot_cpp/classes/ref.hpp +++ b/include/godot_cpp/classes/ref.hpp @@ -240,7 +240,7 @@ public: template <class T> struct PtrToArg<Ref<T>> { _FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) { - return Ref<T>(reinterpret_cast<T*>(godot::internal::gdn_interface->object_get_instance_binding(*(const GDNativeObjectPtr *)p_ptr, godot::internal::token, &T::___binding_callbacks))); + return Ref<T>(reinterpret_cast<T *>(godot::internal::gdn_interface->object_get_instance_binding(*(const GDNativeObjectPtr *)p_ptr, godot::internal::token, &T::___binding_callbacks))); } typedef Ref<T> EncodeT; @@ -255,7 +255,7 @@ struct PtrToArg<const Ref<T> &> { typedef Ref<T> EncodeT; _FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) { - return Ref<T>(reinterpret_cast<T*>(godot::internal::gdn_interface->object_get_instance_binding(*(const GDNativeObjectPtr *)p_ptr, godot::internal::token, &T::___binding_callbacks))); + return Ref<T>(reinterpret_cast<T *>(godot::internal::gdn_interface->object_get_instance_binding(*(const GDNativeObjectPtr *)p_ptr, godot::internal::token, &T::___binding_callbacks))); } }; @@ -264,8 +264,8 @@ struct GetTypeInfo<Ref<T>, typename EnableIf<TypeInherits<RefCounted, T>::value> static const GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_OBJECT; static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; - static inline PropertyInfo get_class_info() { - return PropertyInfo(GDNATIVE_VARIANT_TYPE_OBJECT, T::get_class_static()); + static inline GDNativePropertyInfo get_class_info() { + return make_property_info(GDNATIVE_VARIANT_TYPE_OBJECT, T::get_class_static()); } }; @@ -274,8 +274,8 @@ struct GetTypeInfo<const Ref<T> &, typename EnableIf<TypeInherits<RefCounted, T> static const GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_OBJECT; static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; - static inline PropertyInfo get_class_info() { - return PropertyInfo(GDNATIVE_VARIANT_TYPE_OBJECT, T::get_class_static()); + static inline GDNativePropertyInfo get_class_info() { + return make_property_info(GDNATIVE_VARIANT_TYPE_OBJECT, T::get_class_static()); } }; diff --git a/include/godot_cpp/classes/wrapped.hpp b/include/godot_cpp/classes/wrapped.hpp index cfbf6c0..7881384 100644 --- a/include/godot_cpp/classes/wrapped.hpp +++ b/include/godot_cpp/classes/wrapped.hpp @@ -220,10 +220,10 @@ public: cls->plist_size = 0; \ for (const ::godot::PropertyInfo &E : list) { \ cls->plist[cls->plist_size].type = E.type; \ - cls->plist[cls->plist_size].name = _alloc_and_copy_cstr(E.name); \ + cls->plist[cls->plist_size].name = _alloc_and_copy_cstr(E.name.utf8().get_data()); \ cls->plist[cls->plist_size].hint = E.hint; \ - cls->plist[cls->plist_size].hint_string = _alloc_and_copy_cstr(E.hint_string); \ - cls->plist[cls->plist_size].class_name = _alloc_and_copy_cstr(E.class_name); \ + cls->plist[cls->plist_size].hint_string = _alloc_and_copy_cstr(E.hint_string.utf8().get_data()); \ + cls->plist[cls->plist_size].class_name = _alloc_and_copy_cstr(E.class_name.utf8().get_data()); \ cls->plist[cls->plist_size].usage = E.usage; \ cls->plist_size++; \ } \ |