From f24312380fd46f83a287b8234748a545cc9d6e6c Mon Sep 17 00:00:00 2001
From: Haoyu Qiu <timothyqiu32@gmail.com>
Date: Fri, 8 Apr 2022 17:31:04 +0800
Subject: [PATCH] Rename NavigationServer's free method to free_rid

---
 doc/classes/Navigation2DServer.xml | 4 ++--
 doc/classes/NavigationServer.xml   | 4 ++--
 servers/navigation_2d_server.cpp   | 2 +-
 servers/navigation_server.cpp      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/classes/Navigation2DServer.xml b/doc/classes/Navigation2DServer.xml
index d4599eb88308..5afaa3e72835 100644
--- a/doc/classes/Navigation2DServer.xml
+++ b/doc/classes/Navigation2DServer.xml
@@ -109,9 +109,9 @@
 				Sets the current velocity of the agent.
 			</description>
 		</method>
-		<method name="free" qualifiers="const">
+		<method name="free_rid" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="object" type="RID" />
+			<argument index="0" name="rid" type="RID" />
 			<description>
 				Destroys the given RID.
 			</description>
diff --git a/doc/classes/NavigationServer.xml b/doc/classes/NavigationServer.xml
index 5ebdf6dd76b8..465f5cb4f3ac 100644
--- a/doc/classes/NavigationServer.xml
+++ b/doc/classes/NavigationServer.xml
@@ -109,9 +109,9 @@
 				Sets the current velocity of the agent.
 			</description>
 		</method>
-		<method name="free" qualifiers="const">
+		<method name="free_rid" qualifiers="const">
 			<return type="void" />
-			<argument index="0" name="object" type="RID" />
+			<argument index="0" name="rid" type="RID" />
 			<description>
 				Destroys the given RID.
 			</description>
diff --git a/servers/navigation_2d_server.cpp b/servers/navigation_2d_server.cpp
index 827639b46768..5b41bd7541c1 100644
--- a/servers/navigation_2d_server.cpp
+++ b/servers/navigation_2d_server.cpp
@@ -160,7 +160,7 @@ void Navigation2DServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("agent_is_map_changed", "agent"), &Navigation2DServer::agent_is_map_changed);
 	ClassDB::bind_method(D_METHOD("agent_set_callback", "agent", "receiver", "method", "userdata"), &Navigation2DServer::agent_set_callback, DEFVAL(Variant()));
 
-	ClassDB::bind_method(D_METHOD("free", "object"), &Navigation2DServer::free);
+	ClassDB::bind_method(D_METHOD("free_rid", "rid"), &Navigation2DServer::free);
 }
 
 Navigation2DServer::Navigation2DServer() {
diff --git a/servers/navigation_server.cpp b/servers/navigation_server.cpp
index e30fedc81f5f..5cc55ccda505 100644
--- a/servers/navigation_server.cpp
+++ b/servers/navigation_server.cpp
@@ -73,7 +73,7 @@ void NavigationServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("agent_is_map_changed", "agent"), &NavigationServer::agent_is_map_changed);
 	ClassDB::bind_method(D_METHOD("agent_set_callback", "agent", "receiver", "method", "userdata"), &NavigationServer::agent_set_callback, DEFVAL(Variant()));
 
-	ClassDB::bind_method(D_METHOD("free", "object"), &NavigationServer::free);
+	ClassDB::bind_method(D_METHOD("free_rid", "rid"), &NavigationServer::free);
 
 	ClassDB::bind_method(D_METHOD("set_active", "active"), &NavigationServer::set_active);
 	ClassDB::bind_method(D_METHOD("process", "delta_time"), &NavigationServer::process);