removed duplicated functions in class hierarchy that were bound more than once

added a check to detect this case in the future

4 files changed, 7 insertions, 7 deletions

diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index 43092c3d64..84fe2a00f6 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -176,7 +176,7 @@ void CanvasLayer::_notification(int p_what) {
 
 			}
 			ERR_FAIL_COND(!vp);
-			viewport=vp->get_viewport();
+			viewport=vp->get_viewport_rid();
 
 			VisualServer::get_singleton()->viewport_attach_canvas(viewport,canvas->get_canvas());
 			VisualServer::get_singleton()->viewport_set_canvas_layer(viewport,canvas->get_canvas(),layer);
@@ -232,7 +232,7 @@ void CanvasLayer::set_custom_viewport(Node *p_viewport) {
 		else
 			vp=Node::get_viewport();
 
-		viewport = vp->get_viewport();
+		viewport = vp->get_viewport_rid();
 
 		VisualServer::get_singleton()->viewport_attach_canvas(viewport,canvas->get_canvas());
 		VisualServer::get_singleton()->viewport_set_canvas_layer(viewport,canvas->get_canvas(),layer);
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 25180b568f..63a81a139d 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -40,7 +40,7 @@ void HTTPRequest::_redirect_request(const String& p_new_url) {
 Error HTTPRequest::_request() {
 
 	//print_line("Requesting:\n\tURL: "+url+"\n\tString: "+request_string+"\n\tPort: "+itos(port)+"\n\tSSL: "+itos(use_ssl)+"\n\tValidate SSL: "+itos(validate_ssl));
-	return client->connect(url,port,use_ssl,validate_ssl);
+	return client->connect_to_host(url,port,use_ssl,validate_ssl);
 }
 
 Error HTTPRequest::_parse_url(const String& p_url) {
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index ddda90c3fa..c3ece76b05 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -389,7 +389,7 @@ void Viewport::_notification(int p_what) {
 
 			if (get_parent()) {
 				parent = get_parent()->get_viewport();
-				VisualServer::get_singleton()->viewport_set_parent_viewport(viewport,parent->get_viewport());
+				VisualServer::get_singleton()->viewport_set_parent_viewport(viewport,parent->get_viewport_rid());
 			} else {
 				parent=NULL;
 			}
@@ -736,7 +736,7 @@ void Viewport::_notification(int p_what) {
 	}
 }
 
-RID Viewport::get_viewport() const {
+RID Viewport::get_viewport_rid() const {
 
 	return viewport;
 }
@@ -2754,7 +2754,7 @@ void Viewport::_bind_methods() {
 	ClassDB::bind_method(_MD("set_physics_object_picking","enable"), &Viewport::set_physics_object_picking);
 	ClassDB::bind_method(_MD("get_physics_object_picking"), &Viewport::get_physics_object_picking);
 
-	ClassDB::bind_method(_MD("get_viewport"), &Viewport::get_viewport);
+	ClassDB::bind_method(_MD("get_viewport_rid"), &Viewport::get_viewport_rid);
 	ClassDB::bind_method(_MD("input","local_event"), &Viewport::input);
 	ClassDB::bind_method(_MD("unhandled_input","local_event"), &Viewport::unhandled_input);
 
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 1f30044cef..2831d177c9 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -340,7 +340,7 @@ public:
 
 	Size2 get_size() const;
 	Rect2 get_visible_rect() const;
-	RID get_viewport() const;
+	RID get_viewport_rid() const;
 
 	void set_world(const Ref<World>& p_world);
 	void set_world_2d(const Ref<World2D>& p_world_2d);