diff options
author | Gilles Roudière <gilles.roudiere@gmail.com> | 2022-12-07 14:11:44 +0100 |
---|---|---|
committer | Gilles Roudière <gilles.roudiere@gmail.com> | 2022-12-12 11:06:38 +0100 |
commit | c02e644679655e842dcff543f0defef973cf946c (patch) | |
tree | 67875626a128c08eca565bc3693e2dfbe36fce75 /include/godot_cpp/variant | |
parent | f74c47220382a8e1a347c8dda942a95caea13a0e (diff) | |
download | redot-cpp-c02e644679655e842dcff543f0defef973cf946c.tar.gz |
Rename GDNative to GDExtension
Non-exhaustive list of case-sensitive renames:
GDExtension -> GDNative
GDNATIVE -> GDEXTENSION
gdextension -> gdnative
ExtensionExtension -> Extension (for where there was GDNativeExtension)
EXTENSION_EXTENSION -> EXTENSION (for where there was GDNATIVE_EXTENSION)
gdnlib -> gdextension
gdn_interface -> gde_interface
gdni -> gde_interface
Diffstat (limited to 'include/godot_cpp/variant')
-rw-r--r-- | include/godot_cpp/variant/variant.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/godot_cpp/variant/variant.hpp b/include/godot_cpp/variant/variant.hpp index 4a430ed..18fa5ba 100644 --- a/include/godot_cpp/variant/variant.hpp +++ b/include/godot_cpp/variant/variant.hpp @@ -36,7 +36,7 @@ #include <godot_cpp/variant/builtin_types.hpp> #include <godot_cpp/variant/variant_size.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <array> @@ -45,7 +45,7 @@ namespace godot { class Variant { uint8_t opaque[GODOT_CPP_VARIANT_SIZE]{ 0 }; - _FORCE_INLINE_ GDNativeVariantPtr _native_ptr() const { return const_cast<uint8_t(*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); } + _FORCE_INLINE_ GDExtensionVariantPtr _native_ptr() const { return const_cast<uint8_t(*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); } friend class GDExtensionBinding; friend class MethodBind; @@ -138,14 +138,14 @@ public: }; private: - static GDNativeVariantFromTypeConstructorFunc from_type_constructor[VARIANT_MAX]; - static GDNativeTypeFromVariantConstructorFunc to_type_constructor[VARIANT_MAX]; + static GDExtensionVariantFromTypeConstructorFunc from_type_constructor[VARIANT_MAX]; + static GDExtensionTypeFromVariantConstructorFunc to_type_constructor[VARIANT_MAX]; public: Variant(); Variant(std::nullptr_t n) : Variant() {} - explicit Variant(GDNativeConstVariantPtr native_ptr); + explicit Variant(GDExtensionConstVariantPtr native_ptr); Variant(const Variant &other); Variant(Variant &&other); Variant(bool v); @@ -251,24 +251,24 @@ public: bool operator!=(const Variant &other) const; bool operator<(const Variant &other) const; - void call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error); + void call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); template <class... Args> Variant call(const StringName &method, Args... args) { Variant result; - GDNativeCallError error; - std::array<GDNativeConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; + GDExtensionCallError error; + std::array<GDExtensionConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; call(method, call_args.data(), call_args.size(), result, error); return result; } - static void call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error); + static void call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error); template <class... Args> static Variant call_static(Variant::Type type, const StringName &method, Args... args) { Variant result; - GDNativeCallError error; - std::array<GDNativeConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; + GDExtensionCallError error; + std::array<GDExtensionConstVariantPtr, sizeof...(Args)> call_args = { Variant(args)... }; call_static(type, method, call_args.data(), call_args.size(), result, error); return result; } |