Fix issues with method calls

src/core/method_bind.cpp

@@ -103,7 +103,7 @@ void MethodBind::bind_call(void *p_method_userdata, GDExtensionClassInstancePtr
 	Variant ret = bind->call(p_instance, p_args, p_argument_count, *r_error);
 	// This assumes the return value is an empty Variant, so it doesn't need to call the destructor first.
 	// Since only NativeExtensionMethodBind calls this from the Godot side, it should always be the case.
-	internal::interface->variant_new_copy(r_return, ret.ptr);
+	internal::interface->variant_new_copy(r_return, ret.ptr());
 }
 
 void MethodBind::bind_ptrcall(void *p_method_userdata, GDExtensionClassInstancePtr p_instance, const GDNativeTypePtr *p_args, GDNativeTypePtr r_return) {

src/variant/char_string.cpp

@@ -75,25 +75,25 @@ CharWideString::~CharWideString() {
 // It's easier to have them written in C++ directly than in a Python script that generates them.
 
 String::String(const char *from) {
-	internal::interface->string_new_with_utf8_chars(ptr, from);
+	internal::interface->string_new_with_utf8_chars(ptr(), from);
 }
 
 String::String(const wchar_t *from) {
-	internal::interface->string_new_with_wide_chars(ptr, from);
+	internal::interface->string_new_with_wide_chars(ptr(), from);
 }
 
 String::String(const char16_t *from) {
-	internal::interface->string_new_with_utf16_chars(ptr, from);
+	internal::interface->string_new_with_utf16_chars(ptr(), from);
 }
 
 String::String(const char32_t *from) {
-	internal::interface->string_new_with_utf32_chars(ptr, from);
+	internal::interface->string_new_with_utf32_chars(ptr(), from);
 }
 
 CharString String::utf8() const {
-	int size = internal::interface->string_to_utf8_chars(ptr, nullptr, 0);
+	int size = internal::interface->string_to_utf8_chars(ptr(), nullptr, 0);
 	char *cstr = memnew_arr(char, size + 1);
-	internal::interface->string_to_utf8_chars(ptr, cstr, size + 1);
+	internal::interface->string_to_utf8_chars(ptr(), cstr, size + 1);
 
 	cstr[size] = '\0';
 
@@ -101,9 +101,9 @@ CharString String::utf8() const {
 }
 
 CharString String::ascii() const {
-	int size = internal::interface->string_to_latin1_chars(ptr, nullptr, 0);
+	int size = internal::interface->string_to_latin1_chars(ptr(), nullptr, 0);
 	char *cstr = memnew_arr(char, size + 1);
-	internal::interface->string_to_latin1_chars(ptr, cstr, size + 1);
+	internal::interface->string_to_latin1_chars(ptr(), cstr, size + 1);
 
 	cstr[size] = '\0';
 
@@ -111,9 +111,9 @@ CharString String::ascii() const {
 }
 
 Char16String String::utf16() const {
-	int size = internal::interface->string_to_utf16_chars(ptr, nullptr, 0);
+	int size = internal::interface->string_to_utf16_chars(ptr(), nullptr, 0);
 	char16_t *cstr = memnew_arr(char16_t, size + 1);
-	internal::interface->string_to_utf16_chars(ptr, cstr, size + 1);
+	internal::interface->string_to_utf16_chars(ptr(), cstr, size + 1);
 
 	cstr[size] = '\0';
 
@@ -121,9 +121,9 @@ Char16String String::utf16() const {
 }
 
 Char32String String::utf32() const {
-	int size = internal::interface->string_to_utf32_chars(ptr, nullptr, 0);
+	int size = internal::interface->string_to_utf32_chars(ptr(), nullptr, 0);
 	char32_t *cstr = memnew_arr(char32_t, size + 1);
-	internal::interface->string_to_utf32_chars(ptr, cstr, size + 1);
+	internal::interface->string_to_utf32_chars(ptr(), cstr, size + 1);
 
 	cstr[size] = '\0';
 
@@ -131,9 +131,9 @@ Char32String String::utf32() const {
 }
 
 CharWideString String::wide_string() const {
-	int size = internal::interface->string_to_wide_chars(ptr, nullptr, 0);
+	int size = internal::interface->string_to_wide_chars(ptr(), nullptr, 0);
 	wchar_t *cstr = memnew_arr(wchar_t, size + 1);
-	internal::interface->string_to_wide_chars(ptr, cstr, size + 1);
+	internal::interface->string_to_wide_chars(ptr(), cstr, size + 1);
 
 	cstr[size] = '\0';
 

src/variant/variant.cpp

@@ -82,15 +82,15 @@ void Variant::init_bindings() {
 }
 
 Variant::Variant() {
-	internal::interface->variant_new_nil(ptr);
+	internal::interface->variant_new_nil(ptr());
 }
 
 Variant::Variant(const GDNativeVariantPtr native_ptr) {
-	internal::interface->variant_new_copy(ptr, native_ptr);
+	internal::interface->variant_new_copy(ptr(), native_ptr);
 }
 
 Variant::Variant(const Variant &other) {
-	internal::interface->variant_new_copy(ptr, other.ptr);
+	internal::interface->variant_new_copy(ptr(), other.ptr());
 }
 
 Variant::Variant(Variant &&other) {
@@ -100,158 +100,158 @@ Variant::Variant(Variant &&other) {
 Variant::Variant(bool v) {
 	GDNativeBool encoded;
 	PtrToArg<bool>::encode(v, &encoded);
-	from_type_constructor[BOOL](ptr, &encoded);
+	from_type_constructor[BOOL](ptr(), &encoded);
 }
 
 Variant::Variant(int64_t v) {
 	GDNativeInt encoded;
 	PtrToArg<int64_t>::encode(v, &encoded);
-	from_type_constructor[INT](ptr, &encoded);
+	from_type_constructor[INT](ptr(), &encoded);
 }
 
 Variant::Variant(double v) {
 	double encoded;
 	PtrToArg<double>::encode(v, &encoded);
-	from_type_constructor[FLOAT](ptr, &encoded);
+	from_type_constructor[FLOAT](ptr(), &encoded);
 }
 
 Variant::Variant(const String &v) {
-	from_type_constructor[STRING](ptr, v.ptr);
+	from_type_constructor[STRING](ptr(), v.ptr());
 }
 
 Variant::Variant(const Vector2 &v) {
-	from_type_constructor[VECTOR2](ptr, v.ptr);
+	from_type_constructor[VECTOR2](ptr(), v.ptr());
 }
 
 Variant::Variant(const Vector2i &v) {
-	from_type_constructor[VECTOR2I](ptr, v.ptr);
+	from_type_constructor[VECTOR2I](ptr(), v.ptr());
 }
 
 Variant::Variant(const Rect2 &v) {
-	from_type_constructor[RECT2](ptr, v.ptr);
+	from_type_constructor[RECT2](ptr(), v.ptr());
 }
 
 Variant::Variant(const Rect2i &v) {
-	from_type_constructor[RECT2I](ptr, v.ptr);
+	from_type_constructor[RECT2I](ptr(), v.ptr());
 }
 
 Variant::Variant(const Vector3 &v) {
-	from_type_constructor[VECTOR3](ptr, v.ptr);
+	from_type_constructor[VECTOR3](ptr(), v.ptr());
 }
 
 Variant::Variant(const Vector3i &v) {
-	from_type_constructor[VECTOR3I](ptr, v.ptr);
+	from_type_constructor[VECTOR3I](ptr(), v.ptr());
 }
 
 Variant::Variant(const Transform2D &v) {
-	from_type_constructor[TRANSFORM2D](ptr, v.ptr);
+	from_type_constructor[TRANSFORM2D](ptr(), v.ptr());
 }
 
 Variant::Variant(const Plane &v) {
-	from_type_constructor[PLANE](ptr, v.ptr);
+	from_type_constructor[PLANE](ptr(), v.ptr());
 }
 
 Variant::Variant(const Quaternion &v) {
-	from_type_constructor[QUATERNION](ptr, v.ptr);
+	from_type_constructor[QUATERNION](ptr(), v.ptr());
 }
 
 Variant::Variant(const godot::AABB &v) {
-	from_type_constructor[AABB](ptr, v.ptr);
+	from_type_constructor[AABB](ptr(), v.ptr());
 }
 
 Variant::Variant(const Basis &v) {
-	from_type_constructor[BASIS](ptr, v.ptr);
+	from_type_constructor[BASIS](ptr(), v.ptr());
 }
 
 Variant::Variant(const Transform3D &v) {
-	from_type_constructor[TRANSFORM3D](ptr, v.ptr);
+	from_type_constructor[TRANSFORM3D](ptr(), v.ptr());
 }
 
 Variant::Variant(const Color &v) {
-	from_type_constructor[COLOR](ptr, v.ptr);
+	from_type_constructor[COLOR](ptr(), v.ptr());
 }
 
 Variant::Variant(const StringName &v) {
-	from_type_constructor[STRING_NAME](ptr, v.ptr);
+	from_type_constructor[STRING_NAME](ptr(), v.ptr());
 }
 
 Variant::Variant(const NodePath &v) {
-	from_type_constructor[NODE_PATH](ptr, v.ptr);
+	from_type_constructor[NODE_PATH](ptr(), v.ptr());
 }
 
 Variant::Variant(const godot::RID &v) {
-	from_type_constructor[RID](ptr, v.ptr);
+	from_type_constructor[RID](ptr(), v.ptr());
 }
 
 Variant::Variant(const Object *v) {
-	from_type_constructor[OBJECT](ptr, v->_owner);
+	from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));
 }
 
 Variant::Variant(const Callable &v) {
-	from_type_constructor[CALLABLE](ptr, v.ptr);
+	from_type_constructor[CALLABLE](ptr(), v.ptr());
 }
 
 Variant::Variant(const Signal &v) {
-	from_type_constructor[SIGNAL](ptr, v.ptr);
+	from_type_constructor[SIGNAL](ptr(), v.ptr());
 }
 
 Variant::Variant(const Dictionary &v) {
-	from_type_constructor[DICTIONARY](ptr, v.ptr);
+	from_type_constructor[DICTIONARY](ptr(), v.ptr());
 }
 
 Variant::Variant(const Array &v) {
-	from_type_constructor[ARRAY](ptr, v.ptr);
+	from_type_constructor[ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedByteArray &v) {
-	from_type_constructor[PACKED_BYTE_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_BYTE_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedInt32Array &v) {
-	from_type_constructor[PACKED_INT32_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_INT32_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedInt64Array &v) {
-	from_type_constructor[PACKED_INT64_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_INT64_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedFloat32Array &v) {
-	from_type_constructor[PACKED_FLOAT32_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_FLOAT32_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedFloat64Array &v) {
-	from_type_constructor[PACKED_FLOAT64_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_FLOAT64_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedStringArray &v) {
-	from_type_constructor[PACKED_STRING_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_STRING_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedVector2Array &v) {
-	from_type_constructor[PACKED_VECTOR2_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_VECTOR2_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedVector3Array &v) {
-	from_type_constructor[PACKED_VECTOR3_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_VECTOR3_ARRAY](ptr(), v.ptr());
 }
 
 Variant::Variant(const PackedColorArray &v) {
-	from_type_constructor[PACKED_COLOR_ARRAY](ptr, v.ptr);
+	from_type_constructor[PACKED_COLOR_ARRAY](ptr(), v.ptr());
 }
 
 Variant::~Variant() {
-	internal::interface->variant_destroy(ptr);
+	internal::interface->variant_destroy(ptr());
 }
 
 Variant::operator bool() const {
 	GDNativeBool result;
-	to_type_constructor[BOOL](&result, ptr);
+	to_type_constructor[BOOL](&result, ptr());
 	return PtrToArg<bool>::convert(&result);
 }
 
 Variant::operator int64_t() const {
 	GDNativeInt result;
-	to_type_constructor[INT](&result, ptr);
+	to_type_constructor[INT](&result, ptr());
 	return PtrToArg<int64_t>::convert(&result);
 }
 
@@ -269,7 +269,7 @@ Variant::operator uint32_t() const {
 
 Variant::operator double() const {
 	double result;
-	to_type_constructor[FLOAT](&result, ptr);
+	to_type_constructor[FLOAT](&result, ptr());
 	return PtrToArg<double>::convert(&result);
 }
 
@@ -279,201 +279,196 @@ Variant::operator float() const {
 
 Variant::operator String() const {
 	String result;
-	to_type_constructor[STRING](result.ptr, ptr);
+	to_type_constructor[STRING](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Vector2() const {
 	Vector2 result;
-	to_type_constructor[VECTOR2](result.ptr, ptr);
+	to_type_constructor[VECTOR2](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Vector2i() const {
 	Vector2i result;
-	to_type_constructor[VECTOR2I](result.ptr, ptr);
+	to_type_constructor[VECTOR2I](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Rect2() const {
 	Rect2 result;
-	to_type_constructor[RECT2](result.ptr, ptr);
+	to_type_constructor[RECT2](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Rect2i() const {
 	Rect2i result;
-	to_type_constructor[RECT2I](result.ptr, ptr);
+	to_type_constructor[RECT2I](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Vector3() const {
 	Vector3 result;
-	to_type_constructor[VECTOR3](result.ptr, ptr);
+	to_type_constructor[VECTOR3](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Vector3i() const {
 	Vector3i result;
-	to_type_constructor[VECTOR3I](result.ptr, ptr);
+	to_type_constructor[VECTOR3I](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Transform2D() const {
 	Transform2D result;
-	to_type_constructor[TRANSFORM2D](result.ptr, ptr);
+	to_type_constructor[TRANSFORM2D](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Plane() const {
 	Plane result;
-	to_type_constructor[PLANE](result.ptr, ptr);
+	to_type_constructor[PLANE](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Quaternion() const {
 	Quaternion result;
-	to_type_constructor[QUATERNION](result.ptr, ptr);
+	to_type_constructor[QUATERNION](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator godot::AABB() const {
 	godot::AABB result;
-	to_type_constructor[AABB](result.ptr, ptr);
+	to_type_constructor[AABB](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Basis() const {
 	Basis result;
-	to_type_constructor[BASIS](result.ptr, ptr);
+	to_type_constructor[BASIS](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Transform3D() const {
 	Transform3D result;
-	to_type_constructor[TRANSFORM3D](result.ptr, ptr);
+	to_type_constructor[TRANSFORM3D](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Color() const {
 	Color result;
-	to_type_constructor[COLOR](result.ptr, ptr);
+	to_type_constructor[COLOR](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator StringName() const {
 	StringName result;
-	to_type_constructor[STRING_NAME](result.ptr, ptr);
+	to_type_constructor[STRING_NAME](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator NodePath() const {
 	NodePath result;
-	to_type_constructor[NODE_PATH](result.ptr, ptr);
+	to_type_constructor[NODE_PATH](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator godot::RID() const {
 	godot::RID result;
-	to_type_constructor[RID](result.ptr, ptr);
+	to_type_constructor[RID](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Object *() const {
 	GodotObject *obj;
-	to_type_constructor[OBJECT](&obj, ptr);
+	to_type_constructor[OBJECT](&obj, ptr());
+	if (obj == nullptr) {
+		return nullptr;
+	}
 	return reinterpret_cast<Object *>(internal::interface->object_get_instance_binding(obj, internal::token, &Object::___binding_callbacks));
 }
 
 Variant::operator Callable() const {
 	Callable result;
-	to_type_constructor[CALLABLE](result.ptr, ptr);
+	to_type_constructor[CALLABLE](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Signal() const {
 	Signal result;
-	to_type_constructor[SIGNAL](result.ptr, ptr);
+	to_type_constructor[SIGNAL](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Dictionary() const {
 	Dictionary result;
-	to_type_constructor[DICTIONARY](result.ptr, ptr);
+	to_type_constructor[DICTIONARY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator Array() const {
 	Array result;
-	to_type_constructor[ARRAY](result.ptr, ptr);
+	to_type_constructor[ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedByteArray() const {
 	PackedByteArray result;
-	to_type_constructor[PACKED_BYTE_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_BYTE_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedInt32Array() const {
 	PackedInt32Array result;
-	to_type_constructor[PACKED_INT32_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_INT32_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedInt64Array() const {
 	PackedInt64Array result;
-	to_type_constructor[PACKED_INT64_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_INT64_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedFloat32Array() const {
 	PackedFloat32Array result;
-	to_type_constructor[PACKED_FLOAT32_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_FLOAT32_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedFloat64Array() const {
 	PackedFloat64Array result;
-	to_type_constructor[PACKED_FLOAT64_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_FLOAT64_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedStringArray() const {
 	PackedStringArray result;
-	to_type_constructor[PACKED_STRING_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_STRING_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedVector2Array() const {
 	PackedVector2Array result;
-	to_type_constructor[PACKED_VECTOR2_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_VECTOR2_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedVector3Array() const {
 	PackedVector3Array result;
-	to_type_constructor[PACKED_VECTOR3_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_VECTOR3_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
 Variant::operator PackedColorArray() const {
 	PackedColorArray result;
-	to_type_constructor[PACKED_COLOR_ARRAY](result.ptr, ptr);
+	to_type_constructor[PACKED_COLOR_ARRAY](result.ptr(), ptr());
 	return result;
 }
 
-Variant::operator const GDNativeVariantPtr() const {
-	return reinterpret_cast<const GDNativeVariantPtr>(const_cast<uint8_t(*)[GODOT_CPP_VARIANT_SIZE]>(&opaque));
-}
-
-Variant::operator GDNativeVariantPtr() {
-	return reinterpret_cast<const GDNativeVariantPtr>(&opaque);
-}
-
 Variant &Variant::operator=(const Variant &other) {
 	clear();
-	internal::interface->variant_new_copy(ptr, other.ptr);
+	internal::interface->variant_new_copy(ptr(), other.ptr());
 	return *this;
 }
 
@@ -512,28 +507,23 @@ bool Variant::operator<(const Variant &other) const {
 	return result.operator bool();
 }
 
-void Variant::operator=(const GDNativeVariantPtr other_ptr) {
-	internal::interface->variant_destroy(ptr);
-	internal::interface->variant_new_copy(ptr, other_ptr);
-}
-
 void Variant::call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error) {
-	internal::interface->variant_call(ptr, method.ptr, reinterpret_cast<const GDNativeVariantPtr *>(const_cast<Variant **>(args)), argcount, r_ret.ptr, &r_error);
+	internal::interface->variant_call(ptr(), method.ptr(), reinterpret_cast<const GDNativeVariantPtr *>(const_cast<Variant **>(args)), argcount, r_ret.ptr(), &r_error);
 }
 
 void Variant::call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error) {
-	internal::interface->variant_call_static(static_cast<GDNativeVariantType>(type), method.ptr, reinterpret_cast<const GDNativeVariantPtr *>(const_cast<Variant **>(args)), argcount, r_ret.ptr, &r_error);
+	internal::interface->variant_call_static(static_cast<GDNativeVariantType>(type), method.ptr(), reinterpret_cast<const GDNativeVariantPtr *>(const_cast<Variant **>(args)), argcount, r_ret.ptr(), &r_error);
 }
 
 void Variant::evaluate(const Operator &op, const Variant &a, const Variant &b, Variant &r_ret, bool &r_valid) {
 	GDNativeBool valid;
-	internal::interface->variant_evaluate(static_cast<GDNativeVariantOperator>(op), a.ptr, b.ptr, r_ret.ptr, &valid);
+	internal::interface->variant_evaluate(static_cast<GDNativeVariantOperator>(op), a.ptr(), b.ptr(), r_ret.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 }
 
 void Variant::set(const Variant &key, const Variant &value, bool *r_valid) {
 	GDNativeBool valid;
-	internal::interface->variant_set(ptr, key.ptr, value.ptr, &valid);
+	internal::interface->variant_set(ptr(), key.ptr(), value.ptr(), &valid);
 	if (r_valid) {
 		*r_valid = PtrToArg<bool>::convert(&valid);
 	}
@@ -541,27 +531,27 @@ void Variant::set(const Variant &key, const Variant &value, bool *r_valid) {
 
 void Variant::set_named(const StringName &name, const Variant &value, bool &r_valid) {
 	GDNativeBool valid;
-	internal::interface->variant_set_named(ptr, name.ptr, value.ptr, &valid);
+	internal::interface->variant_set_named(ptr(), name.ptr(), value.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 }
 
 void Variant::set_indexed(int64_t index, const Variant &value, bool &r_valid, bool &r_oob) {
 	GDNativeBool valid, oob;
-	internal::interface->variant_set_indexed(ptr, index, value.ptr, &valid, &oob);
+	internal::interface->variant_set_indexed(ptr(), index, value.ptr(), &valid, &oob);
 	r_valid = PtrToArg<bool>::convert(&valid);
 	r_oob = PtrToArg<bool>::convert(&oob);
 }
 
 void Variant::set_keyed(const Variant &key, const Variant &value, bool &r_valid) {
 	GDNativeBool valid;
-	internal::interface->variant_set_keyed(ptr, key.ptr, value.ptr, &valid);
+	internal::interface->variant_set_keyed(ptr(), key.ptr(), value.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 }
 
 Variant Variant::get(const Variant &key, bool *r_valid) const {
 	Variant result;
 	GDNativeBool valid;
-	internal::interface->variant_get(ptr, key.ptr, result.ptr, &valid);
+	internal::interface->variant_get(ptr(), key.ptr(), result.ptr(), &valid);
 	if (r_valid) {
 		*r_valid = PtrToArg<bool>::convert(&valid);
 	}
@@ -571,7 +561,7 @@ Variant Variant::get(const Variant &key, bool *r_valid) const {
 Variant Variant::get_named(const StringName &name, bool &r_valid) const {
 	Variant result;
 	GDNativeBool valid;
-	internal::interface->variant_get_named(ptr, name.ptr, result.ptr, &valid);
+	internal::interface->variant_get_named(ptr(), name.ptr(), result.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 	return result;
 }
@@ -580,7 +570,7 @@ Variant Variant::get_indexed(int64_t index, bool &r_valid, bool &r_oob) const {
 	Variant result;
 	GDNativeBool valid;
 	GDNativeBool oob;
-	internal::interface->variant_get_indexed(ptr, index, result.ptr, &valid, &oob);
+	internal::interface->variant_get_indexed(ptr(), index, result.ptr(), &valid, &oob);
 	r_valid = PtrToArg<bool>::convert(&valid);
 	r_oob = PtrToArg<bool>::convert(&oob);
 	return result;
@@ -589,7 +579,7 @@ Variant Variant::get_indexed(int64_t index, bool &r_valid, bool &r_oob) const {
 Variant Variant::get_keyed(const Variant &key, bool &r_valid) const {
 	Variant result;
 	GDNativeBool valid;
-	internal::interface->variant_get_keyed(ptr, key.ptr, result.ptr, &valid);
+	internal::interface->variant_get_keyed(ptr(), key.ptr(), result.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 	return result;
 }
@@ -606,36 +596,36 @@ bool Variant::in(const Variant &index, bool *r_valid) const {
 
 bool Variant::iter_init(Variant &r_iter, bool &r_valid) const {
 	GDNativeBool valid;
-	internal::interface->variant_iter_init(ptr, r_iter.ptr, &valid);
+	internal::interface->variant_iter_init(ptr(), r_iter.ptr(), &valid);
 	return PtrToArg<bool>::convert(&valid);
 }
 
 bool Variant::iter_next(Variant &r_iter, bool &r_valid) const {
 	GDNativeBool valid;
-	internal::interface->variant_iter_next(ptr, r_iter.ptr, &valid);
+	internal::interface->variant_iter_next(ptr(), r_iter.ptr(), &valid);
 	return PtrToArg<bool>::convert(&valid);
 }
 
 Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
 	Variant result;
 	GDNativeBool valid;
-	internal::interface->variant_iter_get(ptr, r_iter.ptr, result.ptr, &valid);
+	internal::interface->variant_iter_get(ptr(), r_iter.ptr(), result.ptr(), &valid);
 	r_valid = PtrToArg<bool>::convert(&valid);
 	return result;
 }
 
 Variant::Type Variant::get_type() const {
-	return static_cast<Variant::Type>(internal::interface->variant_get_type(ptr));
+	return static_cast<Variant::Type>(internal::interface->variant_get_type(ptr()));
 }
 
 bool Variant::has_method(const StringName &method) const {
-	GDNativeBool has = internal::interface->variant_has_method(ptr, method.ptr);
+	GDNativeBool has = internal::interface->variant_has_method(ptr(), method.ptr());
 	return PtrToArg<bool>::convert(&has);
 }
 
 bool Variant::has_key(const Variant &key, bool *r_valid) const {
 	GDNativeBool valid;
-	GDNativeBool has = internal::interface->variant_has_key(ptr, key.ptr, &valid);
+	GDNativeBool has = internal::interface->variant_has_key(ptr(), key.ptr(), &valid);
 	if (r_valid) {
 		*r_valid = PtrToArg<bool>::convert(&valid);
 	}
@@ -643,23 +633,23 @@ bool Variant::has_key(const Variant &key, bool *r_valid) const {
 }
 
 bool Variant::has_member(Variant::Type type, const StringName &member) {
-	GDNativeBool has = internal::interface->variant_has_member(static_cast<GDNativeVariantType>(type), member.ptr);
+	GDNativeBool has = internal::interface->variant_has_member(static_cast<GDNativeVariantType>(type), member.ptr());
 	return PtrToArg<bool>::convert(&has);
 }
 
 bool Variant::hash_compare(const Variant &variant) const {
-	GDNativeBool compare = internal::interface->variant_hash_compare(ptr, variant.ptr);
+	GDNativeBool compare = internal::interface->variant_hash_compare(ptr(), variant.ptr());
 	return PtrToArg<bool>::convert(&compare);
 }
 
 bool Variant::booleanize() const {
-	GDNativeBool booleanized = internal::interface->variant_booleanize(ptr);
+	GDNativeBool booleanized = internal::interface->variant_booleanize(ptr());
 	return PtrToArg<bool>::convert(&booleanized);
 }
 
 String Variant::stringify() const {
 	String result;
-	internal::interface->variant_stringify(ptr, result.ptr);
+	internal::interface->variant_stringify(ptr(), result.ptr());
 	return result;
 }
 
@@ -667,21 +657,21 @@ Variant Variant::duplicate(bool deep) const {
 	Variant result;
 	GDNativeBool _deep;
 	PtrToArg<bool>::encode(deep, &_deep);
-	internal::interface->variant_duplicate(ptr, result.ptr, _deep);
+	internal::interface->variant_duplicate(ptr(), result.ptr(), _deep);
 	return result;
 }
 
 void Variant::blend(const Variant &a, const Variant &b, float c, Variant &r_dst) {
-	internal::interface->variant_blend(a.ptr, b.ptr, c, r_dst.ptr);
+	internal::interface->variant_blend(a.ptr(), b.ptr(), c, r_dst.ptr());
 }
 
 void Variant::interpolate(const Variant &a, const Variant &b, float c, Variant &r_dst) {
-	internal::interface->variant_interpolate(a.ptr, b.ptr, c, r_dst.ptr);
+	internal::interface->variant_interpolate(a.ptr(), b.ptr(), c, r_dst.ptr());
 }
 
 String Variant::get_type_name(Variant::Type type) {
 	String result;
-	internal::interface->variant_get_type_name(static_cast<GDNativeVariantType>(type), result.ptr);
+	internal::interface->variant_get_type_name(static_cast<GDNativeVariantType>(type), result.ptr());
 	return result;
 }
 
@@ -741,9 +731,9 @@ void Variant::clear() {
 	};
 
 	if (unlikely(needs_deinit[get_type()])) { // Make it fast for types that don't need deinit.
-		internal::interface->variant_destroy(ptr);
+		internal::interface->variant_destroy(ptr());
 	}
-	internal::interface->variant_new_nil(ptr);
+	internal::interface->variant_new_nil(ptr());
 }
 
 } // namespace godot