Renamed toplevel to be top_level

3 files changed, 33 insertions, 33 deletions

diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index 564de31dca..2b83e4f532 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -499,7 +499,7 @@ void CanvasItem::_toplevel_raise_self() {
 }
 
 void CanvasItem::_enter_canvas() {
-	if ((!Object::cast_to<CanvasItem>(get_parent())) || toplevel) {
+	if ((!Object::cast_to<CanvasItem>(get_parent())) || top_level) {
 		Node *n = this;
 
 		canvas_layer = nullptr;
@@ -674,27 +674,27 @@ Color CanvasItem::get_modulate() const {
 	return modulate;
 }
 
-void CanvasItem::set_as_toplevel(bool p_toplevel) {
-	if (toplevel == p_toplevel) {
+void CanvasItem::set_as_top_level(bool p_toplevel) {
+	if (top_level == p_toplevel) {
 		return;
 	}
 
 	if (!is_inside_tree()) {
-		toplevel = p_toplevel;
+		top_level = p_toplevel;
 		return;
 	}
 
 	_exit_canvas();
-	toplevel = p_toplevel;
+	top_level = p_toplevel;
 	_enter_canvas();
 }
 
-bool CanvasItem::is_set_as_toplevel() const {
-	return toplevel;
+bool CanvasItem::is_set_as_top_level() const {
+	return top_level;
 }
 
 CanvasItem *CanvasItem::get_parent_item() const {
-	if (toplevel) {
+	if (top_level) {
 		return nullptr;
 	}
 
@@ -967,7 +967,7 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
 
 	for (List<CanvasItem *>::Element *E = p_node->children_items.front(); E; E = E->next()) {
 		CanvasItem *ci = E->get();
-		if (ci->toplevel) {
+		if (ci->top_level) {
 			continue;
 		}
 		_notify_transform(ci);
@@ -997,9 +997,9 @@ ObjectID CanvasItem::get_canvas_layer_instance_id() const {
 	}
 }
 
-CanvasItem *CanvasItem::get_toplevel() const {
+CanvasItem *CanvasItem::get_top_level() const {
 	CanvasItem *ci = const_cast<CanvasItem *>(this);
-	while (!ci->toplevel && Object::cast_to<CanvasItem>(ci->get_parent())) {
+	while (!ci->top_level && Object::cast_to<CanvasItem>(ci->get_parent())) {
 		ci = Object::cast_to<CanvasItem>(ci->get_parent());
 	}
 
@@ -1009,7 +1009,7 @@ CanvasItem *CanvasItem::get_toplevel() const {
 Ref<World2D> CanvasItem::get_world_2d() const {
 	ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
 
-	CanvasItem *tl = get_toplevel();
+	CanvasItem *tl = get_top_level();
 
 	if (tl->get_viewport()) {
 		return tl->get_viewport()->find_world_2d();
@@ -1136,8 +1136,8 @@ void CanvasItem::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("update"), &CanvasItem::update);
 
-	ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_toplevel);
-	ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_toplevel);
+	ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_top_level);
+	ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_top_level);
 
 	ClassDB::bind_method(D_METHOD("set_light_mask", "light_mask"), &CanvasItem::set_light_mask);
 	ClassDB::bind_method(D_METHOD("get_light_mask"), &CanvasItem::get_light_mask);
@@ -1218,7 +1218,7 @@ void CanvasItem::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate"), "set_modulate", "get_modulate");
 	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "self_modulate"), "set_self_modulate", "get_self_modulate");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_behind_parent"), "set_draw_behind_parent", "is_draw_behind_parent_enabled");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toplevel"), "set_as_toplevel", "is_set_as_toplevel");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "top_level"), "set_as_top_level", "is_set_as_top_level");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_on_top", PROPERTY_HINT_NONE, "", 0), "_set_on_top", "_is_on_top"); //compatibility
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_light_mask", "get_light_mask");
 
@@ -1354,7 +1354,7 @@ void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
 
 	if (p_propagate) {
 		for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
-			if (!E->get()->toplevel && E->get()->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
+			if (!E->get()->top_level && E->get()->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
 				E->get()->_update_texture_filter_changed(true);
 			}
 		}
@@ -1407,7 +1407,7 @@ void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
 	update();
 	if (p_propagate) {
 		for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
-			if (!E->get()->toplevel && E->get()->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
+			if (!E->get()->top_level && E->get()->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
 				E->get()->_update_texture_repeat_changed(true);
 			}
 		}
@@ -1436,7 +1436,7 @@ CanvasItem::CanvasItem() :
 	pending_update = false;
 	modulate = Color(1, 1, 1, 1);
 	self_modulate = Color(1, 1, 1, 1);
-	toplevel = false;
+	top_level = false;
 	first_draw = false;
 	drawing = false;
 	behind = false;
diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h
index 3f32df87a7..457ec2feef 100644
--- a/scene/main/canvas_item.h
+++ b/scene/main/canvas_item.h
@@ -201,7 +201,7 @@ private:
 	bool first_draw;
 	bool visible;
 	bool pending_update;
-	bool toplevel;
+	bool top_level;
 	bool drawing;
 	bool block_transform_notify;
 	bool behind;
@@ -355,8 +355,8 @@ public:
 
 	/* RECT / TRANSFORM */
 
-	void set_as_toplevel(bool p_toplevel);
-	bool is_set_as_toplevel() const;
+	void set_as_top_level(bool p_toplevel);
+	bool is_set_as_top_level() const;
 
 	void set_draw_behind_parent(bool p_enable);
 	bool is_draw_behind_parent_enabled() const;
@@ -369,7 +369,7 @@ public:
 	virtual Transform2D get_global_transform_with_canvas() const;
 	virtual Transform2D get_screen_transform() const;
 
-	CanvasItem *get_toplevel() const;
+	CanvasItem *get_top_level() const;
 	_FORCE_INLINE_ RID get_canvas_item() const {
 		return canvas_item;
 	}
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 7fefbc3f3c..2f685ab4f5 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1493,7 +1493,7 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
 		if (p_control->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
 			break;
 		}
-		if (p_control->is_set_as_toplevel()) {
+		if (p_control->is_set_as_top_level()) {
 			break;
 		}
 
@@ -1620,7 +1620,7 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu
 				}
 			}
 
-			if (!control->is_inside_tree() || control->is_set_as_toplevel()) {
+			if (!control->is_inside_tree() || control->is_set_as_top_level()) {
 				break;
 			}
 			if (gui.key_event_accepted) {
@@ -1631,7 +1631,7 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu
 			}
 		}
 
-		if (ci->is_set_as_toplevel()) {
+		if (ci->is_set_as_top_level()) {
 			break;
 		}
 
@@ -1655,7 +1655,7 @@ void Viewport::_gui_call_notification(Control *p_control, int p_what) {
 				break;
 			}
 
-			if (!control->is_inside_tree() || control->is_set_as_toplevel()) {
+			if (!control->is_inside_tree() || control->is_set_as_top_level()) {
 				break;
 			}
 			if (control->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
@@ -1663,7 +1663,7 @@ void Viewport::_gui_call_notification(Control *p_control, int p_what) {
 			}
 		}
 
-		if (ci->is_set_as_toplevel()) {
+		if (ci->is_set_as_top_level()) {
 			break;
 		}
 
@@ -1721,7 +1721,7 @@ Control *Viewport::_gui_find_control_at_pos(CanvasItem *p_node, const Point2 &p_
 	if (!c || !c->clips_input() || c->has_point(matrix.affine_inverse().xform(p_global))) {
 		for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
 			CanvasItem *ci = Object::cast_to<CanvasItem>(p_node->get_child(i));
-			if (!ci || ci->is_set_as_toplevel()) {
+			if (!ci || ci->is_set_as_top_level()) {
 				continue;
 			}
 
@@ -1768,7 +1768,7 @@ bool Viewport::_gui_drop(Control *p_at_control, Point2 p_at_pos, bool p_just_che
 
 			p_at_pos = ci->get_transform().xform(p_at_pos);
 
-			if (ci->is_set_as_toplevel()) {
+			if (ci->is_set_as_top_level()) {
 				break;
 			}
 
@@ -1865,7 +1865,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 						}
 					}
 
-					if (ci->is_set_as_toplevel()) {
+					if (ci->is_set_as_top_level()) {
 						break;
 					}
 
@@ -1993,7 +1993,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 							}
 						}
 
-						if (ci->is_set_as_toplevel()) {
+						if (ci->is_set_as_top_level()) {
 							break;
 						}
 
@@ -2105,7 +2105,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 					if (c->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
 						break;
 					}
-					if (c->is_set_as_toplevel()) {
+					if (c->is_set_as_top_level()) {
 						break;
 					}
 					c = c->get_parent_control();
@@ -2404,7 +2404,7 @@ void Viewport::_gui_set_drag_preview(Control *p_base, Control *p_control) {
 	if (gui.drag_preview) {
 		memdelete(gui.drag_preview);
 	}
-	p_control->set_as_toplevel(true);
+	p_control->set_as_top_level(true);
 	p_control->set_position(gui.last_mouse_pos);
 	p_base->get_root_parent_control()->add_child(p_control); //add as child of viewport
 	p_control->raise();