Updated function argument names

editor/animation_editor.h

@@ -278,7 +278,7 @@ class AnimationKeyEditor : public VBoxContainer {
 	void _track_name_changed(const String &p_name);
 	void _track_menu_selected(int p_idx);
 	void _confirm_insert_list();
-	int _confirm_insert(InsertData p_id, int p_at_track = -1);
+	int _confirm_insert(InsertData p_id, int p_last_track = -1);
 	void _query_insert(const InsertData &p_id);
 	void _update_menu();
 	bool insert_queue;

editor/asset_library_editor_plugin.h

@@ -110,7 +110,7 @@ class EditorAssetLibraryItemDescription : public ConfirmationDialog {
 	Ref<Texture> icon;
 
 	void _link_click(const String &p_url);
-	void _preview_click(int p_index);
+	void _preview_click(int p_id);
 
 protected:
 	static void _bind_methods();

editor/collada/collada.h

@@ -613,7 +613,7 @@ private: // private stuff
 	void _parse_curve_geometry(XMLParser &parser, String p_id, String p_name);
 
 	void _parse_skin_controller(XMLParser &parser, String p_id);
-	void _parse_morph_controller(XMLParser &parser, String id);
+	void _parse_morph_controller(XMLParser &parser, String p_id);
 	void _parse_controller(XMLParser &parser);
 
 	Node *_parse_visual_instance_geometry(XMLParser &parser);

editor/dependency_editor.h

@@ -106,7 +106,7 @@ class DependencyErrorDialog : public ConfirmationDialog {
 	void custom_action(const String &);
 
 public:
-	void show(const String &p_for, const Vector<String> &report);
+	void show(const String &p_for_file, const Vector<String> &report);
 	DependencyErrorDialog();
 };
 

editor/editor_autoload_settings.h

@@ -66,7 +66,7 @@ class EditorAutoloadSettings : public VBoxContainer {
 	EditorLineEditFileChooser *autoload_add_path;
 	LineEdit *autoload_add_name;
 
-	bool _autoload_name_is_valid(const String &p_string, String *r_error = NULL);
+	bool _autoload_name_is_valid(const String &p_name, String *r_error = NULL);
 
 	void _autoload_add();
 	void _autoload_selected();
@@ -74,9 +74,9 @@ class EditorAutoloadSettings : public VBoxContainer {
 	void _autoload_button_pressed(Object *p_item, int p_column, int p_button);
 	void _autoload_file_callback(const String &p_path);
 
-	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
-	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
-	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
+	Variant get_drag_data_fw(const Point2 &p_point, Control *p_control);
+	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) const;
+	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control);
 
 protected:
 	void _notification(int p_what);

editor/editor_data.cpp

@@ -633,13 +633,13 @@ Vector<EditorData::EditedScene> EditorData::get_edited_scenes() const {
 	return out_edited_scenes_list;
 }
 
-void EditorData::set_edited_scene_version(uint64_t version, int scene_idx) {
+void EditorData::set_edited_scene_version(uint64_t version, int p_scene_idx) {
 	ERR_FAIL_INDEX(current_edited_scene, edited_scene.size());
-	if (scene_idx < 0) {
+	if (p_scene_idx < 0) {
 		edited_scene[current_edited_scene].version = version;
 	} else {
-		ERR_FAIL_INDEX(scene_idx, edited_scene.size());
-		edited_scene[scene_idx].version = version;
+		ERR_FAIL_INDEX(p_scene_idx, edited_scene.size());
+		edited_scene[p_scene_idx].version = version;
 	}
 }
 

editor/editor_dir_dialog.cpp

@@ -112,19 +112,19 @@ void EditorDirDialog::_notification(int p_what) {
 	}
 }
 
-void EditorDirDialog::_item_collapsed(Object *_p_item) {
+void EditorDirDialog::_item_collapsed(Object *p_item) {
 
-	TreeItem *p_item = _p_item->cast_to<TreeItem>();
+	TreeItem *item = p_item->cast_to<TreeItem>();
 
-	if (updating || p_item->is_collapsed())
+	if (updating || item->is_collapsed())
 		return;
 
-	TreeItem *ci = p_item->get_children();
+	TreeItem *ci = item->get_children();
 	while (ci) {
 
 		String p = ci->get_metadata(0);
 		if (p == "") {
-			String pp = p_item->get_metadata(0);
+			String pp = item->get_metadata(0);
 			ci->set_metadata(0, pp.plus_file(ci->get_text(0)));
 			_update_dir(ci);
 		}

editor/editor_export.h

@@ -290,7 +290,7 @@ public:
 	void set_name(const String &p_name);
 	void set_os_name(const String &p_name);
 
-	void set_logo(const Ref<Texture> &p_loco);
+	void set_logo(const Ref<Texture> &p_logo);
 
 	void set_release_64(const String &p_file);
 	void set_release_32(const String &p_file);

editor/editor_help.h

@@ -137,7 +137,7 @@ class EditorHelp : public VBoxContainer {
 
 	void _help_callback(const String &p_topic);
 
-	void _add_text(const String &p_text);
+	void _add_text(const String &p_bbcode);
 	bool scroll_locked;
 
 	//void _button_pressed(int p_idx);
@@ -189,7 +189,7 @@ class EditorHelpBit : public Panel {
 
 	RichTextLabel *rich_text;
 	void _go_to_help(String p_what);
-	void _meta_clicked(String p_what);
+	void _meta_clicked(String p_select);
 
 protected:
 	static void _bind_methods();

editor/editor_node.cpp

@@ -701,34 +701,34 @@ void EditorNode::_set_scene_metadata(const String &p_file, int p_idx) {
 	ERR_FAIL_COND(err != OK);
 }
 
-bool EditorNode::_find_and_save_resource(RES res, Map<RES, bool> &processed, int32_t flags) {
+bool EditorNode::_find_and_save_resource(RES p_res, Map<RES, bool> &processed, int32_t flags) {
 
-	if (res.is_null())
+	if (p_res.is_null())
 		return false;
 
-	if (processed.has(res)) {
+	if (processed.has(p_res)) {
 
-		return processed[res];
+		return processed[p_res];
 	}
 
-	bool changed = res->is_edited();
-	res->set_edited(false);
+	bool changed = p_res->is_edited();
+	p_res->set_edited(false);
 
-	bool subchanged = _find_and_save_edited_subresources(res.ptr(), processed, flags);
+	bool subchanged = _find_and_save_edited_subresources(p_res.ptr(), processed, flags);
 
-	//print_line("checking if edited: "+res->get_type()+" :: "+res->get_name()+" :: "+res->get_path()+" :: "+itos(changed)+" :: SR "+itos(subchanged));
+	//print_line("checking if edited: "+p_res->get_type()+" :: "+p_res->get_name()+" :: "+p_res->get_path()+" :: "+itos(changed)+" :: SR "+itos(subchanged));
 
-	if (res->get_path().is_resource_file()) {
+	if (p_res->get_path().is_resource_file()) {
 		if (changed || subchanged) {
 			//save
-			print_line("Also saving modified external resource: " + res->get_path());
-			ResourceSaver::save(res->get_path(), res, flags);
+			print_line("Also saving modified external resource: " + p_res->get_path());
+			ResourceSaver::save(p_res->get_path(), p_res, flags);
 		}
-		processed[res] = false; //because it's a file
+		processed[p_res] = false; //because it's a file
 		return false;
 	} else {
 
-		processed[res] = changed;
+		processed[p_res] = changed;
 		return changed;
 	}
 }
@@ -3774,9 +3774,9 @@ void EditorNode::progress_add_task(const String &p_task, const String &p_label,
 	singleton->progress_dialog->add_task(p_task, p_label, p_steps);
 }
 
-void EditorNode::progress_task_step(const String &p_task, const String &p_state, int p_step, bool p_force_redraw) {
+void EditorNode::progress_task_step(const String &p_task, const String &p_state, int p_step, bool p_force_refresh) {
 
-	singleton->progress_dialog->task_step(p_task, p_state, p_step, p_force_redraw);
+	singleton->progress_dialog->task_step(p_task, p_state, p_step, p_force_refresh);
 }
 
 void EditorNode::progress_end_task(const String &p_task) {

editor/editor_node.h

@@ -581,7 +581,7 @@ private:
 	void _update_top_menu_visibility();
 
 	void _update_layouts_menu();
-	void _layout_menu_option(int p_idx);
+	void _layout_menu_option(int p_id);
 
 	void _toggle_search_bar(bool p_pressed);
 	void _clear_search_box();

editor/editor_plugin.h

@@ -134,7 +134,7 @@ public:
 	virtual void make_visible(bool p_visible);
 	virtual void selected_notify() {} //notify that it was raised by the user, not the editor
 	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_node) const;
+	virtual bool handles(Object *p_object) const;
 	virtual Dictionary get_state() const; //save editor state so it can't be reloaded when reloading scene
 	virtual void set_state(const Dictionary &p_state); //restore editor state (likely was saved with the scene)
 	virtual void clear(); // clear any temporary data in te editor, reset it (likely new scene or load another scene)

editor/editor_resource_preview.h

@@ -115,8 +115,8 @@ public:
 	static EditorResourcePreview *get_singleton();
 
 	//callback function is callback(String p_path,Ref<Texture> preview,Variant udata) preview null if could not load
-	void queue_resource_preview(const String &p_res, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata);
-	void queue_edited_resource_preview(const Ref<Resource> &p_path, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata);
+	void queue_resource_preview(const String &p_path, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata);
+	void queue_edited_resource_preview(const Ref<Resource> &p_res, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata);
 
 	void add_preview_generator(const Ref<EditorResourcePreviewGenerator> &p_generator);
 	void remove_preview_generator(const Ref<EditorResourcePreviewGenerator> &p_generator);

editor/editor_settings.cpp

@@ -843,9 +843,9 @@ void EditorSettings::add_property_hint(const PropertyInfo &p_hint) {
 	hints[p_hint.name] = p_hint;
 }
 
-void EditorSettings::set_favorite_dirs(const Vector<String> &p_favorites) {
+void EditorSettings::set_favorite_dirs(const Vector<String> &p_favorites_dirs) {
 
-	favorite_dirs = p_favorites;
+	favorite_dirs = p_favorites_dirs;
 	FileAccess *f = FileAccess::open(get_project_settings_path().plus_file("favorite_dirs"), FileAccess::WRITE);
 	if (f) {
 		for (int i = 0; i < favorite_dirs.size(); i++)
@@ -859,9 +859,9 @@ Vector<String> EditorSettings::get_favorite_dirs() const {
 	return favorite_dirs;
 }
 
-void EditorSettings::set_recent_dirs(const Vector<String> &p_recent) {
+void EditorSettings::set_recent_dirs(const Vector<String> &p_recent_dirs) {
 
-	recent_dirs = p_recent;
+	recent_dirs = p_recent_dirs;
 	FileAccess *f = FileAccess::open(get_project_settings_path().plus_file("recent_dirs"), FileAccess::WRITE);
 	if (f) {
 		for (int i = 0; i < recent_dirs.size(); i++)

editor/editor_settings.h

@@ -145,7 +145,7 @@ public:
 
 	void add_property_hint(const PropertyInfo &p_hint);
 
-	void set_favorite_dirs(const Vector<String> &p_favorite_dirs);
+	void set_favorite_dirs(const Vector<String> &p_favorites_dirs);
 	Vector<String> get_favorite_dirs() const;
 
 	void set_recent_dirs(const Vector<String> &p_recent_dirs);

editor/filesystem_dock.h

@@ -158,7 +158,7 @@ private:
 
 	void _favorites_pressed();
 	void _open_pressed();
-	void _dir_rmb_pressed(const Vector2 &local_mouse_pos);
+	void _dir_rmb_pressed(const Vector2 &p_pos);
 	void _search_changed(const String &p_text);
 
 	void _files_list_rmb_select(int p_item, const Vector2 &p_pos);

editor/import/editor_import_collada.cpp

@@ -87,8 +87,8 @@ struct ColladaImport {
 	Error _create_scene_skeletons(Collada::Node *p_node);
 	Error _create_scene(Collada::Node *p_node, Spatial *p_parent);
 	Error _create_resources(Collada::Node *p_node);
-	Error _create_material(const String &p_material);
-	Error _create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_mesh, const Map<String, Collada::NodeGeometry::Material> &p_material_map, const Collada::MeshData &meshdata, const Transform &p_local_xform, const Vector<int> &bone_remap, const Collada::SkinControllerData *p_skin_data, const Collada::MorphControllerData *p_morph_data, Vector<Ref<ArrayMesh> > p_morph_meshes = Vector<Ref<ArrayMesh> >(), bool p_for_morph = false, bool p_use_mesh_material = false);
+	Error _create_material(const String &p_target);
+	Error _create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_mesh, const Map<String, Collada::NodeGeometry::Material> &p_material_map, const Collada::MeshData &meshdata, const Transform &p_local_xform, const Vector<int> &bone_remap, const Collada::SkinControllerData *p_skin_controller, const Collada::MorphControllerData *p_morph_data, Vector<Ref<ArrayMesh> > p_morph_meshes = Vector<Ref<ArrayMesh> >(), bool p_for_morph = false, bool p_use_mesh_material = false);
 	Error load(const String &p_path, int p_flags, bool p_force_make_tangents = false);
 	void _fix_param_animation_tracks();
 	void create_animation(int p_clip, bool p_make_tracks_in_all_bones, bool p_import_value_tracks);
@@ -591,7 +591,7 @@ static void _generate_tangents_and_binormals(const PoolVector<int> &p_indices, c
 	}
 }
 
-Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_mesh, const Map<String, Collada::NodeGeometry::Material> &p_material_map, const Collada::MeshData &meshdata, const Transform &p_local_xform, const Vector<int> &bone_remap, const Collada::SkinControllerData *skin_controller, const Collada::MorphControllerData *p_morph_data, Vector<Ref<ArrayMesh> > p_morph_meshes, bool p_for_morph, bool p_use_mesh_material) {
+Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_mesh, const Map<String, Collada::NodeGeometry::Material> &p_material_map, const Collada::MeshData &meshdata, const Transform &p_local_xform, const Vector<int> &bone_remap, const Collada::SkinControllerData *p_skin_controller, const Collada::MorphControllerData *p_morph_data, Vector<Ref<ArrayMesh> > p_morph_meshes, bool p_for_morph, bool p_use_mesh_material) {
 
 	bool local_xform_mirror = p_local_xform.basis.determinant() < 0;
 
@@ -714,35 +714,35 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_me
 
 		bool has_weights = false;
 
-		if (skin_controller) {
+		if (p_skin_controller) {
 
 			const Collada::SkinControllerData::Source *weight_src = NULL;
 			int weight_ofs = 0;
 
-			if (skin_controller->weights.sources.has("WEIGHT")) {
+			if (p_skin_controller->weights.sources.has("WEIGHT")) {
 
-				String weight_id = skin_controller->weights.sources["WEIGHT"].source;
-				weight_ofs = skin_controller->weights.sources["WEIGHT"].offset;
-				if (skin_controller->sources.has(weight_id)) {
+				String weight_id = p_skin_controller->weights.sources["WEIGHT"].source;
+				weight_ofs = p_skin_controller->weights.sources["WEIGHT"].offset;
+				if (p_skin_controller->sources.has(weight_id)) {
 
-					weight_src = &skin_controller->sources[weight_id];
+					weight_src = &p_skin_controller->sources[weight_id];
 				}
 			}
 
 			int joint_ofs = 0;
 
-			if (skin_controller->weights.sources.has("JOINT")) {
+			if (p_skin_controller->weights.sources.has("JOINT")) {
 
-				joint_ofs = skin_controller->weights.sources["JOINT"].offset;
+				joint_ofs = p_skin_controller->weights.sources["JOINT"].offset;
 			}
 
 			//should be OK, given this was pre-checked.
 
 			int index_ofs = 0;
-			int wstride = skin_controller->weights.sources.size();
-			for (int w_i = 0; w_i < skin_controller->weights.sets.size(); w_i++) {
+			int wstride = p_skin_controller->weights.sources.size();
+			for (int w_i = 0; w_i < p_skin_controller->weights.sets.size(); w_i++) {
 
-				int amount = skin_controller->weights.sets[w_i];
+				int amount = p_skin_controller->weights.sets[w_i];
 
 				Vector<Collada::Vertex::Weight> weights;
 
@@ -751,13 +751,13 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_me
 					Collada::Vertex::Weight w;
 
 					int read_from = index_ofs + a_i * wstride;
-					ERR_FAIL_INDEX_V(read_from + wstride - 1, skin_controller->weights.indices.size(), ERR_INVALID_DATA);
-					int weight_index = skin_controller->weights.indices[read_from + weight_ofs];
+					ERR_FAIL_INDEX_V(read_from + wstride - 1, p_skin_controller->weights.indices.size(), ERR_INVALID_DATA);
+					int weight_index = p_skin_controller->weights.indices[read_from + weight_ofs];
 					ERR_FAIL_INDEX_V(weight_index, weight_src->array.size(), ERR_INVALID_DATA);
 
 					w.weight = weight_src->array[weight_index];
 
-					int bone_index = skin_controller->weights.indices[read_from + joint_ofs];
+					int bone_index = p_skin_controller->weights.indices[read_from + joint_ofs];
 					if (bone_index == -1)
 						continue; //ignore this weight (refers to bind shape)
 					ERR_FAIL_INDEX_V(bone_index, bone_remap.size(), ERR_INVALID_DATA);

editor/plugins/animation_player_editor_plugin.h

@@ -155,7 +155,7 @@ class AnimationPlayerEditor : public VBoxContainer {
 	void _animation_player_changed(Object *p_pl);
 
 	void _animation_key_editor_seek(float p_pos, bool p_drag);
-	void _animation_key_editor_anim_len_changed(float p_new);
+	void _animation_key_editor_anim_len_changed(float p_len);
 	void _animation_key_editor_anim_step_changed(float p_len);
 
 	void _unhandled_key_input(const Ref<InputEvent> &p_ev);
@@ -198,8 +198,8 @@ public:
 
 	virtual String get_name() const { return "Anim"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	AnimationPlayerEditorPlugin(EditorNode *p_node);

editor/plugins/animation_tree_editor_plugin.cpp

@@ -676,16 +676,16 @@ AnimationTreeEditor::ClickType AnimationTreeEditor::_locate_click(const Point2 &
 	return CLICK_NONE;
 }
 
-Point2 AnimationTreeEditor::_get_slot_pos(const StringName &p_node, bool p_input, int p_slot) {
+Point2 AnimationTreeEditor::_get_slot_pos(const StringName &p_node_id, bool p_input, int p_slot) {
 
 	Ref<StyleBox> style = get_stylebox("panel", "PopupMenu");
 	Ref<Font> font = get_font("font", "PopupMenu");
 	Ref<Texture> slot_icon = get_icon("NodeRealSlot", "EditorIcons");
 
-	Size2 size = get_node_size(p_node);
-	Point2 pos = anim_tree->node_get_pos(p_node);
+	Size2 size = get_node_size(p_node_id);
+	Point2 pos = anim_tree->node_get_pos(p_node_id);
 
-	if (click_type == CLICK_NODE && click_node == p_node) {
+	if (click_type == CLICK_NODE && click_node == p_node_id) {
 
 		pos += click_motion - click_pos;
 		if (pos.x < 5)

editor/plugins/animation_tree_editor_plugin.h

@@ -160,7 +160,7 @@ protected:
 
 public:
 	virtual Size2 get_minimum_size() const;
-	void edit(AnimationTreePlayer *p_player);
+	void edit(AnimationTreePlayer *p_anim_tree);
 	AnimationTreeEditor();
 };
 
@@ -175,8 +175,8 @@ class AnimationTreeEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "AnimTree"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	AnimationTreeEditorPlugin(EditorNode *p_node);

editor/plugins/camera_editor_plugin.h

@@ -68,8 +68,8 @@ class CameraEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Camera"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	CameraEditorPlugin(EditorNode *p_node);

editor/plugins/canvas_item_editor_plugin.cpp

@@ -863,9 +863,9 @@ void CanvasItemEditor::incend(float &beg, float &end, float inc, float minsize,
 	}
 }
 
-void CanvasItemEditor::_append_canvas_item(CanvasItem *c) {
+void CanvasItemEditor::_append_canvas_item(CanvasItem *p_item) {
 
-	editor_selection->add_node(c);
+	editor_selection->add_node(p_item);
 }
 
 void CanvasItemEditor::_snap_changed() {

editor/plugins/collision_polygon_2d_editor_plugin.h

@@ -97,8 +97,8 @@ public:
 
 	virtual String get_name() const { return "CollisionPolygon2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	CollisionPolygon2DEditorPlugin(EditorNode *p_node);

editor/plugins/collision_polygon_editor_plugin.h

@@ -109,8 +109,8 @@ public:
 
 	virtual String get_name() const { return "CollisionPolygon"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	CollisionPolygonEditorPlugin(EditorNode *p_node);

editor/plugins/collision_shape_2d_editor_plugin.cpp

@@ -585,12 +585,12 @@ void CollisionShape2DEditorPlugin::make_visible(bool visible) {
 	}
 }
 
-CollisionShape2DEditorPlugin::CollisionShape2DEditorPlugin(EditorNode *p_node) {
+CollisionShape2DEditorPlugin::CollisionShape2DEditorPlugin(EditorNode *p_editor) {
 
-	editor = p_node;
+	editor = p_editor;
 
-	collision_shape_2d_editor = memnew(CollisionShape2DEditor(p_node));
-	p_node->get_gui_base()->add_child(collision_shape_2d_editor);
+	collision_shape_2d_editor = memnew(CollisionShape2DEditor(p_editor));
+	p_editor->get_gui_base()->add_child(collision_shape_2d_editor);
 }
 
 CollisionShape2DEditorPlugin::~CollisionShape2DEditorPlugin() {

editor/plugins/gi_probe_editor_plugin.h

@@ -52,8 +52,8 @@ protected:
 public:
 	virtual String get_name() const { return "GIProbe"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	GIProbeEditorPlugin(EditorNode *p_node);

editor/plugins/gradient_editor_plugin.h

@@ -50,8 +50,8 @@ protected:
 public:
 	virtual String get_name() const { return "ColorRamp"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	GradientEditorPlugin(EditorNode *p_node);

editor/plugins/item_list_editor_plugin.h

@@ -243,8 +243,8 @@ class ItemListEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "ItemList"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	ItemListEditorPlugin(EditorNode *p_node);

editor/plugins/light_occluder_2d_editor_plugin.h

@@ -101,8 +101,8 @@ public:
 
 	virtual String get_name() const { return "LightOccluder2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	LightOccluder2DEditorPlugin(EditorNode *p_node);

editor/plugins/line_2d_editor_plugin.cpp

@@ -54,9 +54,9 @@ void Line2DEditor::_notification(int p_what) {
 	}
 }
 
-Vector2 Line2DEditor::mouse_to_local_pos(Vector2 gpoint, bool alt) {
+Vector2 Line2DEditor::mouse_to_local_pos(Vector2 gpos, bool alt) {
 	Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-	return !alt ? canvas_item_editor->snap_point(xform.affine_inverse().xform(gpoint)) : node->get_global_transform().affine_inverse().xform(canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint)));
+	return !alt ? canvas_item_editor->snap_point(xform.affine_inverse().xform(gpos)) : node->get_global_transform().affine_inverse().xform(canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpos)));
 }
 
 int Line2DEditor::get_point_index_at(Vector2 gpos) {

editor/plugins/line_2d_editor_plugin.h

@@ -101,8 +101,8 @@ public:
 
 	virtual String get_name() const { return "Line2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	Line2DEditorPlugin(EditorNode *p_node);

editor/plugins/mesh_editor_plugin.h

@@ -81,8 +81,8 @@ class MeshEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Mesh"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	MeshEditorPlugin(EditorNode *p_node);

editor/plugins/mesh_instance_editor_plugin.h

@@ -82,8 +82,8 @@ class MeshInstanceEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "MeshInstance"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	MeshInstanceEditorPlugin(EditorNode *p_node);

editor/plugins/multimesh_editor_plugin.h

@@ -95,8 +95,8 @@ class MultiMeshEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "MultiMesh"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	MultiMeshEditorPlugin(EditorNode *p_node);

editor/plugins/navigation_polygon_editor_plugin.h

@@ -102,8 +102,8 @@ public:
 
 	virtual String get_name() const { return "NavigationPolygonInstance"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	NavigationPolygonEditorPlugin(EditorNode *p_node);

editor/plugins/particles_2d_editor_plugin.h

@@ -87,8 +87,8 @@ protected:
 public:
 	virtual String get_name() const { return "Particles2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	Particles2DEditorPlugin(EditorNode *p_node);

editor/plugins/particles_editor_plugin.h

@@ -102,8 +102,8 @@ class ParticlesEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Particles"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	ParticlesEditorPlugin(EditorNode *p_node);

editor/plugins/path_2d_editor_plugin.h

@@ -112,8 +112,8 @@ public:
 
 	virtual String get_name() const { return "Path2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	Path2DEditorPlugin(EditorNode *p_node);

editor/plugins/path_editor_plugin.h

@@ -83,8 +83,8 @@ public:
 	virtual Ref<SpatialEditorGizmo> create_spatial_gizmo(Spatial *p_spatial);
 	virtual String get_name() const { return "Path"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	PathEditorPlugin(EditorNode *p_node);

editor/plugins/polygon_2d_editor_plugin.h

@@ -152,8 +152,8 @@ public:
 
 	virtual String get_name() const { return "Polygon2D"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	Polygon2DEditorPlugin(EditorNode *p_node);

editor/plugins/resource_preloader_editor_plugin.h

@@ -91,8 +91,8 @@ class ResourcePreloaderEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "ResourcePreloader"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	ResourcePreloaderEditorPlugin(EditorNode *p_node);

editor/plugins/rich_text_editor_plugin.h

@@ -79,8 +79,8 @@ class RichTextEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "RichText"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	RichTextEditorPlugin(EditorNode *p_node);

editor/plugins/script_editor_plugin.h

@@ -65,7 +65,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	void popup(const Vector<String> &p_base, bool p_dontclear = false);
+	void popup(const Vector<String> &p_functions, bool p_dontclear = false);
 	ScriptEditorQuickOpen();
 };
 
@@ -223,14 +223,14 @@ class ScriptEditor : public PanelContainer {
 	EditorHelpIndex *help_index;
 
 	void _tab_changed(int p_which);
-	void _menu_option(int p_optin);
+	void _menu_option(int p_option);
 
 	Tree *disk_changed_list;
 	ConfirmationDialog *disk_changed;
 
 	bool restoring_layout;
 
-	String _get_debug_tooltip(const String &p_text, Node *_ste);
+	String _get_debug_tooltip(const String &p_text, Node *_se);
 
 	void _resave_scripts(const String &p_str);
 	void _reload_scripts();
@@ -392,8 +392,8 @@ class ScriptEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Script"; }
 	bool has_main_screen() const { return true; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 	virtual void selected_notify();
 

editor/plugins/shader_editor_plugin.h

@@ -92,7 +92,7 @@ class ShaderEditor : public VBoxContainer {
 
 	ShaderTextEditor *shader_editor;
 
-	void _menu_option(int p_optin);
+	void _menu_option(int p_option);
 	void _params_changed();
 	mutable Ref<Shader> shader;
 
@@ -130,8 +130,8 @@ class ShaderEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Shader"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 	virtual void selected_notify();
 

editor/plugins/spatial_editor_plugin.cpp

@@ -410,7 +410,7 @@ void SpatialEditorViewport::_find_items_at_pos(const Point2 &p_pos, bool &r_incl
 	results.sort();
 }
 
-Vector3 SpatialEditorViewport::_get_screen_to_space(const Vector3 &p_pos) {
+Vector3 SpatialEditorViewport::_get_screen_to_space(const Vector3 &p_vector3) {
 
 	CameraMatrix cm;
 	cm.set_perspective(get_fov(), get_size().aspect(), get_znear(), get_zfar());
@@ -423,7 +423,7 @@ Vector3 SpatialEditorViewport::_get_screen_to_space(const Vector3 &p_pos) {
 	camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
 	camera_transform.translate(0, 0, cursor.distance);
 
-	return camera_transform.xform(Vector3(((p_pos.x / get_size().width) * 2.0 - 1.0) * screen_w, ((1.0 - (p_pos.y / get_size().height)) * 2.0 - 1.0) * screen_h, -get_znear()));
+	return camera_transform.xform(Vector3(((p_vector3.x / get_size().width) * 2.0 - 1.0) * screen_w, ((1.0 - (p_vector3.y / get_size().height)) * 2.0 - 1.0) * screen_h, -get_znear()));
 }
 
 void SpatialEditorViewport::_select_region() {

editor/plugins/spatial_editor_plugin.h

@@ -245,7 +245,7 @@ private:
 	void _draw();
 
 	void _smouseenter();
-	void _sinput(const Ref<InputEvent> &p_ie);
+	void _sinput(const Ref<InputEvent> &p_event);
 	void _update_freelook(real_t delta);
 	SpatialEditor *spatial_editor;
 

editor/plugins/sprite_frames_editor_plugin.h

@@ -121,8 +121,8 @@ class SpriteFramesEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "SpriteFrames"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	SpriteFramesEditorPlugin(EditorNode *p_node);

editor/plugins/texture_editor_plugin.h

@@ -61,8 +61,8 @@ class TextureEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "Texture"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	TextureEditorPlugin(EditorNode *p_node);

editor/plugins/texture_region_editor_plugin.cpp

@@ -898,12 +898,12 @@ TextureRegionEditor::TextureRegionEditor(EditorNode *p_editor) {
 	edit_draw->set_clip_contents(true);
 }
 
-void TextureRegionEditorPlugin::edit(Object *p_node) {
-	region_editor->edit(p_node);
+void TextureRegionEditorPlugin::edit(Object *p_object) {
+	region_editor->edit(p_object);
 }
 
-bool TextureRegionEditorPlugin::handles(Object *p_obj) const {
-	return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Rect") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture");
+bool TextureRegionEditorPlugin::handles(Object *p_object) const {
+	return p_object->is_class("Sprite") || p_object->is_class("Patch9Rect") || p_object->is_class("StyleBoxTexture") || p_object->is_class("AtlasTexture");
 }
 
 void TextureRegionEditorPlugin::make_visible(bool p_visible) {

editor/plugins/texture_region_editor_plugin.h

@@ -139,8 +139,8 @@ class TextureRegionEditorPlugin : public EditorPlugin {
 public:
 	virtual String get_name() const { return "TextureRegion"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 	void set_state(const Dictionary &p_state);
 	Dictionary get_state() const;

editor/plugins/tile_map_editor_plugin.h

@@ -197,8 +197,8 @@ public:
 
 	virtual String get_name() const { return "TileMap"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	TileMapEditorPlugin(EditorNode *p_node);

editor/plugins/tile_set_editor_plugin.cpp

@@ -147,12 +147,12 @@ void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) {
 	}
 }
 
-void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_merge) {
+void TileSetEditor::_import_scene(Node *p_scene, Ref<TileSet> p_library, bool p_merge) {
 
 	if (!p_merge)
 		p_library->clear();
 
-	_import_node(scene, p_library);
+	_import_node(p_scene, p_library);
 }
 
 void TileSetEditor::_menu_confirm() {

editor/property_editor.cpp

@@ -4183,9 +4183,9 @@ void PropertyEditor::set_keying(bool p_active) {
 	update_tree();
 }
 
-void PropertyEditor::_draw_flags(Object *t, const Rect2 &p_rect) {
+void PropertyEditor::_draw_flags(Object *p_object, const Rect2 &p_rect) {
 
-	TreeItem *ti = t->cast_to<TreeItem>();
+	TreeItem *ti = p_object->cast_to<TreeItem>();
 	if (!ti)
 		return;
 

editor/property_editor.h

@@ -217,8 +217,8 @@ class PropertyEditor : public Control {
 
 	TreeItem *find_item(TreeItem *p_item, const String &p_name);
 
-	virtual void _changed_callback(Object *p_changed, const char *p_what);
-	virtual void _changed_callbacks(Object *p_changed, const String &p_callback);
+	virtual void _changed_callback(Object *p_changed, const char *p_prop);
+	virtual void _changed_callbacks(Object *p_changed, const String &p_prop);
 
 	void _check_reload_status(const String &p_name, TreeItem *item);
 
@@ -228,7 +228,7 @@ class PropertyEditor : public Control {
 
 	friend class ProjectExportDialog;
 	void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all = false, const String &p_changed_field = "");
-	void _draw_flags(Object *ti, const Rect2 &p_rect);
+	void _draw_flags(Object *p_object, const Rect2 &p_rect);
 
 	bool _might_be_in_instance();
 	bool _get_instanced_node_original_property(const StringName &p_prop, Variant &value);

editor/resources_dock.h

@@ -73,7 +73,7 @@ class ResourcesDock : public VBoxContainer {
 	bool block_add;
 	int current_action;
 
-	void _file_action(const String &p_action);
+	void _file_action(const String &p_path);
 
 	void _delete(Object *p_item, int p_column, int p_id);
 	void _resource_selected();

editor/scene_tree_dock.h

@@ -189,7 +189,7 @@ public:
 
 	void import_subscene();
 	void set_edited_scene(Node *p_scene);
-	void instance(const String &p_path);
+	void instance(const String &p_file);
 	void instance_scenes(const Vector<String> &p_files, Node *p_parent = NULL);
 	void set_selected(Node *p_node, bool p_emit_selected = false);
 	void fill_path_renames(Node *p_node, Node *p_new_parent, List<Pair<NodePath, NodePath> > *p_renames);

editor/scene_tree_editor.h

@@ -101,7 +101,7 @@ class SceneTreeEditor : public Control {
 	static void _bind_methods();
 
 	void _cell_button_pressed(Object *p_item, int p_column, int p_id);
-	void _cell_multi_selected(Object *p_object, int p_cel, bool p_selected);
+	void _cell_multi_selected(Object *p_object, int p_cell, bool p_selected);
 	void _update_selection(TreeItem *item);
 	void _node_script_changed(Node *p_node);
 	void _node_visibility_changed(Node *p_node);

editor/script_create_dialog.h

@@ -74,7 +74,7 @@ class ScriptCreateDialog : public ConfirmationDialog {
 	void _path_changed(const String &p_path = String());
 	void _lang_changed(int l = 0);
 	void _built_in_pressed();
-	bool _validate(const String &p_strin);
+	bool _validate(const String &p_string);
 	void _class_name_changed(const String &p_name);
 	void _parent_name_changed(const String &p_parent);
 	void _template_changed(int p_template = 0);

editor/spatial_editor_gizmos.h

@@ -278,7 +278,7 @@ public:
 	virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
 
 	void redraw();
-	ReflectionProbeGizmo(ReflectionProbe *p_notifier = NULL);
+	ReflectionProbeGizmo(ReflectionProbe *p_probe = NULL);
 };
 
 class GIProbeGizmo : public EditorSpatialGizmo {
@@ -294,7 +294,7 @@ public:
 	virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
 
 	void redraw();
-	GIProbeGizmo(GIProbe *p_notifier = NULL);
+	GIProbeGizmo(GIProbe *p_probe = NULL);
 };
 
 class CollisionShapeSpatialGizmo : public EditorSpatialGizmo {

modules/enet/networked_multiplayer_enet.h

@@ -113,7 +113,7 @@ public:
 
 	virtual int get_packet_peer() const;
 
-	Error create_server(int p_port, int p_max_peers = 32, int p_in_bandwidth = 0, int p_out_bandwidth = 0);
+	Error create_server(int p_port, int p_max_clients = 32, int p_in_bandwidth = 0, int p_out_bandwidth = 0);
 	Error create_client(const IP_Address &p_ip, int p_port, int p_in_bandwidth = 0, int p_out_bandwidth = 0);
 
 	void close_connection();

modules/gdnative/gdnative.h

@@ -137,7 +137,7 @@ public:
 	bool initialize();
 	bool terminate();
 
-	Variant call_native(StringName p_call_type, StringName p_procedure_name, Array p_arguments = Array());
+	Variant call_native(StringName p_native_call_type, StringName p_procedure_name, Array p_arguments = Array());
 	void call_native_raw(StringName p_raw_call_type, StringName p_procedure_name, void *data, int num_args, void **args, void *r_return);
 };
 

modules/gdnative/godot/string.cpp

@@ -63,13 +63,13 @@ void GDAPI godot_string_new_unicode_data(godot_string *r_dest, const wchar_t *p_
 	memnew_placement(dest, String(p_contents, p_size));
 }
 
-void GDAPI godot_string_get_data(const godot_string *p_self, char *r_dest, int *p_size) {
+void GDAPI godot_string_get_data(const godot_string *p_self, char *p_dest, int *p_size) {
 	String *self = (String *)p_self;
 	if (p_size != NULL) {
 		*p_size = self->utf8().length();
 	}
-	if (r_dest != NULL) {
-		memcpy(r_dest, self->utf8().get_data(), *p_size);
+	if (p_dest != NULL) {
+		memcpy(p_dest, self->utf8().get_data(), *p_size);
 	}
 }
 
@@ -277,11 +277,11 @@ godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_sel
 	return self->hex_to_int(true);
 }
 
-godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int at_pos, godot_string p_content) {
+godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, godot_string p_string) {
 	const String *self = (const String *)p_self;
-	String *content = (String *)&p_content;
+	String *content = (String *)&p_string;
 	godot_string result;
-	memnew_placement(&result, String(self->insert(at_pos, *content)));
+	memnew_placement(&result, String(self->insert(p_at_pos, *content)));
 
 	return result;
 }

modules/gdnative/godot/string.h

@@ -83,8 +83,8 @@ godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, co
 godot_int GDAPI godot_string_findn(const godot_string *p_self, godot_string p_what);
 godot_int GDAPI godot_string_findn_from(const godot_string *p_self, godot_string p_what, godot_int p_from);
 godot_int GDAPI find_last(const godot_string *p_self, godot_string p_what);
-godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *values);
-godot_string GDAPI godot_string_format_with_custom_placeholder(const godot_string *p_self, const godot_variant *values, const char *placeholder);
+godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *p_values);
+godot_string GDAPI godot_string_format_with_custom_placeholder(const godot_string *p_self, const godot_variant *p_values, const char *p_placeholder);
 godot_string GDAPI godot_string_hex_encode_buffer(const uint8_t *p_buffer, godot_int p_len);
 godot_int GDAPI godot_string_hex_to_int(const godot_string *p_self);
 godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_self);

modules/gdscript/gd_function.cpp

@@ -1233,10 +1233,10 @@ int GDFunction::get_default_argument_count() const {
 
 	return default_arguments.size();
 }
-int GDFunction::get_default_argument_addr(int p_arg) const {
+int GDFunction::get_default_argument_addr(int p_idx) const {
 
-	ERR_FAIL_INDEX_V(p_arg, default_arguments.size(), -1);
-	return default_arguments[p_arg];
+	ERR_FAIL_INDEX_V(p_idx, default_arguments.size(), -1);
+	return default_arguments[p_idx];
 }
 
 StringName GDFunction::get_name() const {

modules/gridmap/grid_map.cpp

@@ -1049,21 +1049,21 @@ void GridMap::_update_area_instances() {
 	}
 }
 
-Error GridMap::create_area(int p_id, const Rect3 &p_bounds) {
+Error GridMap::create_area(int p_id, const Rect3 &p_area) {
 
 	ERR_FAIL_COND_V(area_map.has(p_id), ERR_ALREADY_EXISTS);
 	ERR_EXPLAIN("ID 0 is taken as global area, start from 1");
 	ERR_FAIL_COND_V(p_id == 0, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_bounds.has_no_area(), ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V(p_area.has_no_area(), ERR_INVALID_PARAMETER);
 
 	// FIRST VALIDATE AREA
 	IndexKey from, to;
-	from.x = p_bounds.position.x;
-	from.y = p_bounds.position.y;
-	from.z = p_bounds.position.z;
-	to.x = p_bounds.position.x + p_bounds.size.x;
-	to.y = p_bounds.position.y + p_bounds.size.y;
-	to.z = p_bounds.position.z + p_bounds.size.z;
+	from.x = p_area.position.x;
+	from.y = p_area.position.y;
+	from.z = p_area.position.z;
+	to.x = p_area.position.x + p_area.size.x;
+	to.y = p_area.position.y + p_area.size.y;
+	to.z = p_area.position.z + p_area.size.z;
 
 	for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) {
 		//this should somehow be faster...

modules/gridmap/grid_map.h

@@ -242,7 +242,7 @@ public:
 	void set_center_z(bool p_enable);
 	bool get_center_z() const;
 
-	void set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_orientation = 0);
+	void set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot = 0);
 	int get_cell_item(int p_x, int p_y, int p_z) const;
 	int get_cell_item_orientation(int p_x, int p_y, int p_z) const;
 

modules/gridmap/grid_map_editor_plugin.h

@@ -239,8 +239,8 @@ public:
 	virtual bool forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) { return gridmap_editor->forward_spatial_input_event(p_camera, p_event); }
 	virtual String get_name() const { return "GridMap"; }
 	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
+	virtual void edit(Object *p_object);
+	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
 
 	GridMapEditorPlugin(EditorNode *p_node);

modules/nativescript/nativescript.h

@@ -120,7 +120,7 @@ public:
 	void set_class_name(String p_class_name);
 	String get_class_name() const;
 
-	void set_library(Ref<GDNativeLibrary> library);
+	void set_library(Ref<GDNativeLibrary> p_library);
 	Ref<GDNativeLibrary> get_library() const;
 
 	virtual bool can_instance() const;

modules/visual_script/visual_script.h

@@ -291,8 +291,8 @@ public:
 	void data_disconnect(const StringName &p_func, int p_from_node, int p_from_port, int p_to_node, int p_to_port);
 	bool has_data_connection(const StringName &p_func, int p_from_node, int p_from_port, int p_to_node, int p_to_port) const;
 	void get_data_connection_list(const StringName &p_func, List<DataConnection> *r_connection) const;
-	bool is_input_value_port_connected(const StringName &p_name, int p_node, int p_port) const;
-	bool get_input_value_port_connection_source(const StringName &p_name, int p_node, int p_port, int *r_node, int *r_port) const;
+	bool is_input_value_port_connected(const StringName &p_func, int p_node, int p_port) const;
+	bool get_input_value_port_connection_source(const StringName &p_func, int p_node, int p_port, int *r_node, int *r_port) const;
 
 	void add_variable(const StringName &p_name, const Variant &p_default_value = Variant(), bool p_export = false);
 	bool has_variable(const StringName &p_name) const;

modules/visual_script/visual_script_editor.cpp

@@ -2450,17 +2450,17 @@ void VisualScriptEditor::_graph_connect_to_empty(const String &p_from, int p_fro
 	port_action_popup->popup();
 }
 
-VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_node, int p_output, Set<int> &visited_nodes) {
+VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_action_node, int p_port_action_output, Set<int> &visited_nodes) {
 
 	VisualScriptNode::TypeGuess tg;
 	tg.type = Variant::NIL;
 
-	if (visited_nodes.has(p_node))
+	if (visited_nodes.has(p_port_action_node))
 		return tg; //no loop
 
-	visited_nodes.insert(p_node);
+	visited_nodes.insert(p_port_action_node);
 
-	Ref<VisualScriptNode> node = script->get_node(edited_func, p_node);
+	Ref<VisualScriptNode> node = script->get_node(edited_func, p_port_action_node);
 
 	if (!node.is_valid()) {
 
@@ -2479,7 +2479,7 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_node, i
 			int from_node;
 			int from_port;
 
-			if (script->get_input_value_port_connection_source(edited_func, p_node, i, &from_node, &from_port)) {
+			if (script->get_input_value_port_connection_source(edited_func, p_port_action_node, i, &from_node, &from_port)) {
 
 				g = _guess_output_type(from_node, from_port, visited_nodes);
 			} else {
@@ -2501,7 +2501,7 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_node, i
 		in_guesses.push_back(g);
 	}
 
-	return node->guess_output_type(in_guesses.ptr(), p_output);
+	return node->guess_output_type(in_guesses.ptr(), p_port_action_output);
 }
 
 void VisualScriptEditor::_port_action_menu(int p_option) {

modules/visual_script/visual_script_func_nodes.cpp

@@ -341,12 +341,12 @@ String VisualScriptFunctionCall::get_base_script() const {
 	return base_script;
 }
 
-void VisualScriptFunctionCall::set_singleton(const StringName &p_path) {
+void VisualScriptFunctionCall::set_singleton(const StringName &p_type) {
 
-	if (singleton == p_path)
+	if (singleton == p_type)
 		return;
 
-	singleton = p_path;
+	singleton = p_type;
 	Object *obj = ProjectSettings::get_singleton()->get_singleton_object(singleton);
 	if (obj) {
 		base_type = obj->get_class();

modules/visual_script/visual_script_func_nodes.h

@@ -70,7 +70,7 @@ private:
 	MethodInfo method_cache;
 	void _update_method_cache();
 
-	void _set_argument_cache(const Dictionary &p_args);
+	void _set_argument_cache(const Dictionary &p_cache);
 	Dictionary _get_argument_cache() const;
 
 protected:

modules/visual_script/visual_script_nodes.cpp

@@ -1208,6 +1208,7 @@ void VisualScriptPreload::set_preload(const Ref<Resource> &p_preload) {
 	preload = p_preload;
 	ports_changed_notify();
 }
+
 Ref<Resource> VisualScriptPreload::get_preload() const {
 
 	return preload;

modules/visual_script/visual_script_nodes.h

@@ -196,7 +196,7 @@ public:
 	virtual String get_text() const;
 	virtual String get_category() const { return "data"; }
 
-	void set_variable(StringName p_var);
+	void set_variable(StringName p_variable);
 	StringName get_variable() const;
 
 	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
@@ -230,7 +230,7 @@ public:
 	virtual String get_text() const;
 	virtual String get_category() const { return "data"; }
 
-	void set_variable(StringName p_var);
+	void set_variable(StringName p_variable);
 	StringName get_variable() const;
 
 	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
@@ -301,7 +301,7 @@ public:
 	virtual String get_text() const;
 	virtual String get_category() const { return "data"; }
 
-	void set_preload(const Ref<Resource> &p_value);
+	void set_preload(const Ref<Resource> &p_preload);
 	Ref<Resource> get_preload() const;
 
 	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);