From 9d2e8f2f27ec467e9004e0d94f8106b3bb1d0afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 9 Nov 2020 14:53:05 +0100
Subject: Variant: Rename Type::_RID to Type::RID

The underscore prefix was used to avoid the conflict between the `RID` class
name and the matching enum value in `Variant::Type`.

This can be fixed differently by prefixing uses of the `RID` class in `Variant`
with the scope resolution operator, as done already for `AABB`.
---
 core/variant/variant_construct.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/variant/variant_construct.cpp')

diff --git a/core/variant/variant_construct.cpp b/core/variant/variant_construct.cpp
index b847ba09b9..e263d98815 100644
--- a/core/variant/variant_construct.cpp
+++ b/core/variant/variant_construct.cpp
@@ -577,7 +577,7 @@ void Variant::_register_variant_constructors() {
 	add_constructor<VariantConstructor<NodePath, NodePath>>(sarray("from"));
 	add_constructor<VariantConstructor<NodePath, String>>(sarray("from"));
 
-	add_constructor<VariantConstructor<RID, RID>>(sarray("from"));
+	add_constructor<VariantConstructor<::RID, ::RID>>(sarray("from"));
 
 	add_constructor<VariantConstructorObject>(sarray("from"));
 	add_constructor<VariantConstructorNilObject>(sarray("from"));
@@ -654,7 +654,7 @@ void Variant::_register_variant_constructors() {
 	initialize_funcs[COLOR] = variant_initialize<Color>;
 	initialize_funcs[STRING_NAME] = variant_initialize<StringName>;
 	initialize_funcs[NODE_PATH] = variant_initialize<NodePath>;
-	initialize_funcs[_RID] = variant_initialize<RID>;
+	initialize_funcs[RID] = variant_initialize<::RID>;
 	initialize_funcs[OBJECT] = variant_initialize_obj;
 	initialize_funcs[CALLABLE] = variant_initialize<Callable>;
 	initialize_funcs[SIGNAL] = variant_initialize<Signal>;
-- 
cgit v1.2.3