A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code

1 files changed, 145 insertions, 167 deletions

diff --git a/editor/editor_node.h b/editor/editor_node.h
index fb0b5c4c2..cb165bdf2 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -29,60 +29,59 @@
 #ifndef EDITOR_NODE_H
 #define EDITOR_NODE_H
 
-#include "scene/gui/control.h"
-#include "scene/gui/panel.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/tree.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/separator.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/panel_container.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/center_container.h"
-#include "scene/gui/texture_progress.h"
-#include "editor/filesystem_dock.h"
-#include "editor/scene_tree_editor.h"
-#include "editor/property_editor.h"
-#include "editor/create_dialog.h"
 #include "editor/call_dialog.h"
-#include "editor/reparent_dialog.h"
 #include "editor/connections_dialog.h"
-#include "editor/node_dock.h"
-#include "editor/import_dock.h"
-#include "editor/settings_config_dialog.h"
-#include "editor/groups_editor.h"
+#include "editor/create_dialog.h"
 #include "editor/editor_data.h"
 #include "editor/editor_path.h"
 #include "editor/editor_run.h"
+#include "editor/filesystem_dock.h"
+#include "editor/groups_editor.h"
+#include "editor/import_dock.h"
+#include "editor/node_dock.h"
+#include "editor/property_editor.h"
+#include "editor/reparent_dialog.h"
+#include "editor/scene_tree_editor.h"
+#include "editor/settings_config_dialog.h"
+#include "scene/gui/center_container.h"
+#include "scene/gui/control.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/file_dialog.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/panel.h"
+#include "scene/gui/panel_container.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/gui/texture_progress.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/tree.h"
 
 #include "editor/pane_drag.h"
 
-#include "editor/script_create_dialog.h"
-#include "editor/run_settings_dialog.h"
-#include "editor/project_settings.h"
-#include "editor/project_export.h"
 #include "editor/editor_log.h"
-#include "editor/scene_tree_dock.h"
-#include "editor/resources_dock.h"
 #include "editor/editor_run_script.h"
+#include "editor/project_export.h"
+#include "editor/project_settings.h"
+#include "editor/resources_dock.h"
+#include "editor/run_settings_dialog.h"
+#include "editor/scene_tree_dock.h"
+#include "editor/script_create_dialog.h"
 
+#include "editor/editor_name_dialog.h"
+#include "editor/editor_plugin.h"
 #include "editor/editor_run_native.h"
-#include "scene/gui/tabs.h"
-#include "editor/quick_open.h"
-#include "editor/project_export.h"
 #include "editor/editor_sub_scene.h"
+#include "editor/project_export.h"
+#include "editor/quick_open.h"
 #include "editor_export.h"
 #include "editor_reimport_dialog.h"
-#include "editor/editor_plugin.h"
-#include "editor/editor_name_dialog.h"
+#include "scene/gui/tabs.h"
 
-#include "fileserver/editor_file_server.h"
 #include "editor_resource_preview.h"
+#include "fileserver/editor_file_server.h"
 #include "scene/gui/viewport_container.h"
 
-
 #include "progress_dialog.h"
 
 #include "editor_scale.h"
@@ -90,10 +89,6 @@
 	@author Juan Linietsky <reduzio@gmail.com>
 */
 
-
-
-
-
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();
 typedef void (*EditorBuildCallback)();
@@ -102,7 +97,7 @@ class EditorPluginList;
 
 class EditorNode : public Node {
 
-	GDCLASS( EditorNode, Node );
+	GDCLASS(EditorNode, Node);
 
 public:
 	enum DockSlot {
@@ -116,9 +111,10 @@ public:
 		DOCK_SLOT_RIGHT_BR,
 		DOCK_SLOT_MAX
 	};
+
 private:
 	enum {
-		HISTORY_SIZE=64
+		HISTORY_SIZE = 64
 	};
 
 	enum MenuOptions {
@@ -194,21 +190,19 @@ private:
 		DEPENDENCY_UPDATE_IMPORTED,
 		SCENE_TAB_CLOSE,
 
-		IMPORT_PLUGIN_BASE=100,
+		IMPORT_PLUGIN_BASE = 100,
 
-		OBJECT_METHOD_BASE=500,
+		OBJECT_METHOD_BASE = 500,
 
-		TOOL_MENU_BASE=1000
+		TOOL_MENU_BASE = 1000
 	};
 
-
-
 	//Node *edited_scene; //scene being edited
 	Viewport *scene_root; //root of the scene being edited
 
 	//Ref<ResourceImportMetadata> scene_import_metadata;
 
-	PanelContainer* scene_root_parent;
+	PanelContainer *scene_root_parent;
 	Control *gui_base;
 	VBoxContainer *main_vbox;
 
@@ -240,7 +234,6 @@ private:
 	//PaneDrag *pd_anim;
 	Panel *menu_panel;
 
-
 	//HSplitContainer *editor_hsplit;
 	//VSplitContainer *editor_vsplit;
 	CenterContainer *play_cc;
@@ -335,10 +328,10 @@ private:
 	EditorQuickOpen *quick_run;
 
 	HBoxContainer *main_editor_button_vb;
-	Vector<ToolButton*> main_editor_buttons;
-	Vector<EditorPlugin*> editor_table;
+	Vector<ToolButton *> main_editor_buttons;
+	Vector<EditorPlugin *> editor_table;
 
-//	EditorReImportDialog *reimport_dialog;
+	//	EditorReImportDialog *reimport_dialog;
 
 	ProgressDialog *progress_dialog;
 	BackgroundProgress *progress_hb;
@@ -350,7 +343,6 @@ private:
 	Button *new_inherited_button;
 	String open_import_request;
 
-
 	TabContainer *dock_slot[DOCK_SLOT_MAX];
 	Rect2 dock_select_rect[DOCK_SLOT_MAX];
 	int dock_select_rect_over;
@@ -386,7 +378,7 @@ private:
 	uint64_t circle_step_frame;
 	int circle_step;
 
-	Vector<EditorPlugin*> editor_plugins;
+	Vector<EditorPlugin *> editor_plugins;
 	EditorPlugin *editor_plugin_screen;
 	EditorPluginList *editor_plugins_over;
 
@@ -394,13 +386,12 @@ private:
 	EditorData editor_data;
 	EditorRun editor_run;
 	EditorSelection *editor_selection;
-//	ProjectExport *project_export;
+	//	ProjectExport *project_export;
 	ProjectExportDialog *project_export;
 	EditorResourcePreview *resource_preview;
 
 	EditorFileServer *file_server;
 
-
 	struct BottomPanelItem {
 		String name;
 		Control *control;
@@ -421,17 +412,16 @@ private:
 
 	void _dialog_action(String p_file);
 
-
 	void _edit_current();
-	void _dialog_display_file_error(String p_file,Error p_error);
+	void _dialog_display_file_error(String p_file, Error p_error);
 
 	int current_option;
 	//void _animation_visibility_toggle();
 	void _resource_created();
-	void _resource_selected(const RES& p_res,const String& p_property="");
+	void _resource_selected(const RES &p_res, const String &p_property = "");
 	void _menu_option(int p_option);
 	void _menu_confirm_current();
-	void _menu_option_confirm(int p_option,bool p_confirmed);
+	void _menu_option_confirm(int p_option, bool p_confirmed);
 	void _update_debug_options();
 
 	void _property_editor_forward();
@@ -440,15 +430,14 @@ private:
 	void _select_history(int p_idx);
 	void _prepare_history();
 
-
 	void _fs_changed();
 	void _sources_changed(bool p_exist);
 	void _imported(Node *p_node);
 
 	void _node_renamed();
 	void _editor_select(int p_which);
-	void _set_scene_metadata(const String &p_file, int p_idx=-1);
-	void _get_scene_metadata(const String& p_file);
+	void _set_scene_metadata(const String &p_file, int p_idx = -1);
+	void _get_scene_metadata(const String &p_file);
 	void _update_title();
 	void _update_scene_tabs();
 	void _close_messages();
@@ -459,37 +448,36 @@ private:
 
 	void _save_scene(String p_file, int idx = -1);
 
+	void _instance_request(const Vector<String> &p_files);
 
-	void _instance_request(const Vector<String>& p_files);
-
-	void _property_keyed(const String& p_keyed, const Variant& p_value, bool p_advance);
-	void _transform_keyed(Object *sp,const String& p_sub,const Transform& p_key);
+	void _property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance);
+	void _transform_keyed(Object *sp, const String &p_sub, const Transform &p_key);
 
 	void _hide_top_editors();
 	void _display_top_editors(bool p_display);
-	void _set_top_editors(Vector<EditorPlugin*> p_editor_plugins_over);
-	void _set_editing_top_editors(Object * p_current_object);
+	void _set_top_editors(Vector<EditorPlugin *> p_editor_plugins_over);
+	void _set_editing_top_editors(Object *p_current_object);
 
 	void _quick_opened();
 	void _quick_run();
 
-	void _run(bool p_current=false, const String &p_custom="");
+	void _run(bool p_current = false, const String &p_custom = "");
 
 	void _save_optimized();
-	void _import_action(const String& p_action);
+	void _import_action(const String &p_action);
 	void _import(const String &p_file);
-	void _add_to_recent_scenes(const String& p_scene);
+	void _add_to_recent_scenes(const String &p_scene);
 	void _update_recent_scenes();
 	void _open_recent_scene(int p_idx);
-	void _dropped_files(const Vector<String>& p_files,int p_screen);
+	void _dropped_files(const Vector<String> &p_files, int p_screen);
 	//void _open_recent_scene_confirm();
 	String _recent_scene;
 
 	bool convert_old;
 
-	void _unhandled_input(const InputEvent& p_event);
+	void _unhandled_input(const InputEvent &p_event);
 
-	static void _load_error_notify(void* p_ud,const String& p_text);
+	static void _load_error_notify(void *p_ud, const String &p_text);
 
 	bool has_main_screen() const { return true; }
 
@@ -497,41 +485,37 @@ private:
 
 	String import_reload_fn;
 
-	Set<FileDialog*> file_dialogs;
-	Set<EditorFileDialog*> editor_file_dialogs;
+	Set<FileDialog *> file_dialogs;
+	Set<EditorFileDialog *> editor_file_dialogs;
 
-	Map<String,Ref<Texture> > icon_type_cache;
+	Map<String, Ref<Texture> > icon_type_cache;
 
 	bool _initializing_addons;
-	Map<String,EditorPlugin*> plugin_addons;
+	Map<String, EditorPlugin *> plugin_addons;
 
-
-	static Ref<Texture> _file_dialog_get_icon(const String& p_path);
+	static Ref<Texture> _file_dialog_get_icon(const String &p_path);
 	static void _file_dialog_register(FileDialog *p_dialog);
 	static void _file_dialog_unregister(FileDialog *p_dialog);
 	static void _editor_file_dialog_register(EditorFileDialog *p_dialog);
 	static void _editor_file_dialog_unregister(EditorFileDialog *p_dialog);
 
-
 	void _cleanup_scene();
 	void _remove_edited_scene();
 	void _remove_scene(int index);
-	bool _find_and_save_resource(RES p_res,Map<RES,bool>& processed,int32_t flags);
-	bool _find_and_save_edited_subresources(Object *obj,Map<RES,bool>& processed,int32_t flags);
-	void _save_edited_subresources(Node* scene,Map<RES,bool>& processed,int32_t flags);
+	bool _find_and_save_resource(RES p_res, Map<RES, bool> &processed, int32_t flags);
+	bool _find_and_save_edited_subresources(Object *obj, Map<RES, bool> &processed, int32_t flags);
+	void _save_edited_subresources(Node *scene, Map<RES, bool> &processed, int32_t flags);
 
-	void _find_node_types(Node* p_node, int&count_2d, int&count_3d);
+	void _find_node_types(Node *p_node, int &count_2d, int &count_3d);
 	void _save_scene_with_preview(String p_file);
 
+	Map<String, Set<String> > dependency_errors;
 
-	Map<String,Set<String> > dependency_errors;
-
-	static void _dependency_error_report(void *ud,const String& p_path,const String& p_dep,const String& p_type) {
-		EditorNode*en=(EditorNode*)ud;
+	static void _dependency_error_report(void *ud, const String &p_path, const String &p_dep, const String &p_type) {
+		EditorNode *en = (EditorNode *)ud;
 		if (!en->dependency_errors.has(p_path))
-			en->dependency_errors[p_path]=Set<String>();
-		en->dependency_errors[p_path].insert(p_dep+"::"+p_type);
-
+			en->dependency_errors[p_path] = Set<String>();
+		en->dependency_errors[p_path].insert(p_dep + "::" + p_type);
 	}
 
 	struct ExportDefer {
@@ -546,9 +530,9 @@ private:
 
 	static Vector<EditorNodeInitCallback> _init_callbacks;
 
-	bool _find_scene_in_use(Node* p_node,const String& p_path) const;
+	bool _find_scene_in_use(Node *p_node, const String &p_path) const;
 
-	void _dock_select_input(const InputEvent& p_input);
+	void _dock_select_input(const InputEvent &p_input);
 	void _dock_move_left();
 	void _dock_move_right();
 	void _dock_select_draw();
@@ -560,14 +544,14 @@ private:
 	void _scene_tab_script_edited(int p_tab);
 
 	Dictionary _get_main_scene_state();
-	void _set_main_scene_state(Dictionary p_state,Node* p_for_scene);
+	void _set_main_scene_state(Dictionary p_state, Node *p_for_scene);
 
 	int _get_current_main_editor();
 
 	void _save_docks();
 	void _load_docks();
-	void _save_docks_to_config(Ref<ConfigFile> p_layout, const String& p_section);
-	void _load_docks_from_config(Ref<ConfigFile> p_layout, const String& p_section);
+	void _save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section);
+	void _load_docks_from_config(Ref<ConfigFile> p_layout, const String &p_section);
 	void _update_dock_slots_visibility();
 	void _update_top_menu_visibility();
 
@@ -580,19 +564,18 @@ private:
 
 	void _update_addon_config();
 
-	static void _file_access_close_error_notify(const String& p_str);
+	static void _file_access_close_error_notify(const String &p_str);
 
 	void _toggle_distraction_free_mode();
 
 	enum {
-		MAX_INIT_CALLBACKS=128,
-		MAX_BUILD_CALLBACKS=128
+		MAX_INIT_CALLBACKS = 128,
+		MAX_BUILD_CALLBACKS = 128
 	};
 
 	void _inherit_imported(const String &p_action);
 	void _open_imported();
 
-
 	static int plugin_init_callback_count;
 	static EditorPluginInitializeCallback plugin_init_callbacks[MAX_INIT_CALLBACKS];
 
@@ -612,14 +595,14 @@ private:
 
 	Vector<ToolMenuItem> tool_menu_items;
 
-	void _tool_menu_insert_item(const ToolMenuItem& p_item);
+	void _tool_menu_insert_item(const ToolMenuItem &p_item);
 	void _rebuild_tool_menu() const;
 
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
-public:
 
+public:
 	static void add_plugin_init_callback(EditorPluginInitializeCallback p_callback);
 
 	enum EditorTable {
@@ -629,8 +612,7 @@ public:
 	};
 
 	void set_visible_editor(EditorTable p_table) { _editor_select(p_table); }
-	static EditorNode* get_singleton() { return singleton; }
-
+	static EditorNode *get_singleton() { return singleton; }
 
 	EditorPlugin *get_editor_plugin_screen() { return editor_plugin_screen; }
 	EditorPluginList *get_editor_plugins_over() { return editor_plugins_over; }
@@ -640,8 +622,7 @@ public:
 	static void add_editor_plugin(EditorPlugin *p_editor);
 	static void remove_editor_plugin(EditorPlugin *p_editor);
 
-	void new_inherited_scene() { _menu_option_confirm(FILE_NEW_INHERITED_SCENE,false); }
-
+	void new_inherited_scene() { _menu_option_confirm(FILE_NEW_INHERITED_SCENE, false); }
 
 	void set_docks_visible(bool p_show);
 	bool get_docks_visible() const;
@@ -649,35 +630,34 @@ public:
 	void set_distraction_free_mode(bool p_enter);
 	bool get_distraction_free_mode() const;
 
-	void add_control_to_dock(DockSlot p_slot,Control* p_control);
-	void remove_control_from_dock(Control* p_control);
+	void add_control_to_dock(DockSlot p_slot, Control *p_control);
+	void remove_control_from_dock(Control *p_control);
 
-	void set_addon_plugin_enabled(const String& p_addon,bool p_enabled);
+	void set_addon_plugin_enabled(const String &p_addon, bool p_enabled);
 	bool is_addon_plugin_enabled(const String &p_addon) const;
 
 	void edit_node(Node *p_node);
-	void edit_resource(const Ref<Resource>& p_resource);
-	void open_resource(const String& p_type="");
+	void edit_resource(const Ref<Resource> &p_resource);
+	void open_resource(const String &p_type = "");
 
-	void save_resource_in_path(const Ref<Resource>& p_resource,const String& p_path);
-	void save_resource(const Ref<Resource>& p_resource);
-	void save_resource_as(const Ref<Resource>& p_resource, const String &p_at_path=String());
+	void save_resource_in_path(const Ref<Resource> &p_resource, const String &p_path);
+	void save_resource(const Ref<Resource> &p_resource);
+	void save_resource_as(const Ref<Resource> &p_resource, const String &p_at_path = String());
 
-	void merge_from_scene() { _menu_option_confirm(FILE_IMPORT_SUBSCENE,false); }
+	void merge_from_scene() { _menu_option_confirm(FILE_IMPORT_SUBSCENE, false); }
 
 	static bool has_unsaved_changes() { return singleton->unsaved_cache; }
 
 	static HBoxContainer *get_menu_hb() { return singleton->menu_hb; }
 
-	void push_item(Object *p_object,const String& p_property="");
+	void push_item(Object *p_object, const String &p_property = "");
 
-	void open_request(const String& p_path);
+	void open_request(const String &p_path);
 
 	bool is_changing_scene() const;
 
-
 	static EditorLog *get_log() { return singleton->log; }
-	Control* get_viewport();
+	Control *get_viewport();
 
 	//void animation_editor_make_visible(bool p_visible);
 	//void hide_animation_player_editors();
@@ -689,31 +669,31 @@ public:
 
 	Viewport *get_scene_root() { return scene_root; } //root of the scene being edited
 
-	void fix_dependencies(const String& p_for_file);
+	void fix_dependencies(const String &p_for_file);
 	void clear_scene() { _cleanup_scene(); }
-	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false, bool p_clear_errors=true,bool p_force_open_imported=false);
-	Error load_resource(const String& p_scene);
+	Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_clear_errors = true, bool p_force_open_imported = false);
+	Error load_resource(const String &p_scene);
 
-	bool is_scene_open(const String& p_path);
+	bool is_scene_open(const String &p_path);
 
 	void set_current_version(uint64_t p_version);
 	void set_current_scene(int p_idx);
 
-	static EditorData& get_editor_data() { return singleton->editor_data; }
-	EditorHistory * get_editor_history() { return &editor_history; }
+	static EditorData &get_editor_data() { return singleton->editor_data; }
+	EditorHistory *get_editor_history() { return &editor_history; }
 
 	static VSplitContainer *get_top_split() { return singleton->top_split; }
 
 	void request_instance_scene(const String &p_path);
-	void request_instance_scenes(const Vector<String>& p_files);
+	void request_instance_scenes(const Vector<String> &p_files);
 	FileSystemDock *get_filesystem_dock();
 	ImportDock *get_import_dock();
 	SceneTreeDock *get_scene_tree_dock();
-	static UndoRedo* get_undo_redo() { return &singleton->editor_data.get_undo_redo(); }
+	static UndoRedo *get_undo_redo() { return &singleton->editor_data.get_undo_redo(); }
 
 	EditorSelection *get_editor_selection() { return editor_selection; }
 
-	void set_convert_old_scene(bool p_old) { convert_old=p_old; }
+	void set_convert_old_scene(bool p_old) { convert_old = p_old; }
 
 	void notify_child_process_exited();
 
@@ -722,11 +702,9 @@ public:
 
 	Ref<Theme> get_editor_theme() const { return theme; }
 
+	void show_warning(const String &p_text, const String &p_title = "Warning!");
 
-	void show_warning(const String& p_text,const String& p_title="Warning!");
-
-
-	Error export_platform(const String& p_platform, const String& p_path, bool p_debug,const String& p_password,bool p_quit_after=false);
+	Error export_platform(const String &p_platform, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after = false);
 
 	static void register_editor_types();
 	static void unregister_editor_types();
@@ -734,19 +712,19 @@ public:
 	Control *get_gui_base() { return gui_base; }
 	Control *get_theme_base() { return gui_base->get_parent_control(); }
 
-	static void add_io_error(const String& p_error);
+	static void add_io_error(const String &p_error);
 
-	static void progress_add_task(const String& p_task,const String& p_label, int p_steps);
-	static void progress_task_step(const String& p_task,const String& p_state, int p_step=-1,bool p_force_refresh=true);
-	static void progress_end_task(const String& p_task);
+	static void progress_add_task(const String &p_task, const String &p_label, int p_steps);
+	static void progress_task_step(const String &p_task, const String &p_state, int p_step = -1, bool p_force_refresh = true);
+	static void progress_end_task(const String &p_task);
 
-	static void progress_add_task_bg(const String& p_task,const String& p_label, int p_steps);
-	static void progress_task_step_bg(const String& p_task,int p_step=-1);
-	static void progress_end_task_bg(const String& p_task);
+	static void progress_add_task_bg(const String &p_task, const String &p_label, int p_steps);
+	static void progress_task_step_bg(const String &p_task, int p_step = -1);
+	static void progress_end_task_bg(const String &p_task);
 
 	void save_scene(String p_file) { _save_scene(p_file); }
 
-	bool is_scene_in_use(const String& p_path);
+	bool is_scene_in_use(const String &p_path);
 
 	void scan_import_changes();
 
@@ -754,79 +732,79 @@ public:
 
 	void update_keying();
 
-	void reload_scene(const String& p_path);
+	void reload_scene(const String &p_path);
 
 	bool is_exiting() const { return exiting; }
 
 	ToolButton *get_pause_button() { return pause_button; }
 
-
-	ToolButton* add_bottom_panel_item(String p_text,Control *p_item);
+	ToolButton *add_bottom_panel_item(String p_text, Control *p_item);
 	bool are_bottom_panels_hidden() const;
 	void make_bottom_panel_item_visible(Control *p_item);
 	void raise_bottom_panel_item(Control *p_item);
 	void hide_bottom_panel();
 	void remove_bottom_panel_item(Control *p_item);
 
-	Variant drag_resource(const Ref<Resource>& p_res,Control* p_from);
-	Variant drag_files(const Vector<String>& p_files,Control* p_from);
-	Variant drag_files_and_dirs(const Vector<String>& p_files,Control* p_from);
+	Variant drag_resource(const Ref<Resource> &p_res, Control *p_from);
+	Variant drag_files(const Vector<String> &p_files, Control *p_from);
+	Variant drag_files_and_dirs(const Vector<String> &p_files, Control *p_from);
 
-	void add_tool_menu_item(const String& p_name, Object *p_handler, const String& p_callback, const Variant& p_ud = Variant());
-	void add_tool_submenu_item(const String& p_name, PopupMenu *p_submenu);
-	void remove_tool_menu_item(const String& p_name);
+	void add_tool_menu_item(const String &p_name, Object *p_handler, const String &p_callback, const Variant &p_ud = Variant());
+	void add_tool_submenu_item(const String &p_name, PopupMenu *p_submenu);
+	void remove_tool_menu_item(const String &p_name);
 
 	EditorNode();
 	~EditorNode();
-	void get_singleton(const char* arg1, bool arg2);
+	void get_singleton(const char *arg1, bool arg2);
 
 	static void add_init_callback(EditorNodeInitCallback p_callback) { _init_callbacks.push_back(p_callback); }
 	static void add_build_callback(EditorBuildCallback p_callback);
-
-
-
 };
 
 struct EditorProgress {
 
 	String task;
-	void step(const String& p_state, int p_step=-1,bool p_force_refresh=true) { EditorNode::progress_task_step(task,p_state,p_step,p_force_refresh); }
-	EditorProgress(const String& p_task,const String& p_label,int p_amount) { EditorNode::progress_add_task(p_task,p_label,p_amount); task=p_task; }
+	void step(const String &p_state, int p_step = -1, bool p_force_refresh = true) { EditorNode::progress_task_step(task, p_state, p_step, p_force_refresh); }
+	EditorProgress(const String &p_task, const String &p_label, int p_amount) {
+		EditorNode::progress_add_task(p_task, p_label, p_amount);
+		task = p_task;
+	}
 	~EditorProgress() { EditorNode::progress_end_task(task); }
 };
 
 class EditorPluginList : public Object {
 private:
-	Vector<EditorPlugin*> plugins_list;
+	Vector<EditorPlugin *> plugins_list;
 
 public:
-
-	void set_plugins_list(Vector<EditorPlugin*> p_plugins_list) {
+	void set_plugins_list(Vector<EditorPlugin *> p_plugins_list) {
 		plugins_list = p_plugins_list;
 	}
 
-	Vector<EditorPlugin*>& get_plugins_list() {
+	Vector<EditorPlugin *> &get_plugins_list() {
 		return plugins_list;
 	}
 
 	void make_visible(bool p_visible);
 	void edit(Object *p_object);
-	bool forward_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event);
-	bool forward_spatial_gui_input(Camera* p_camera, const InputEvent& p_event);
-	void forward_draw_over_canvas(const Transform2D& p_canvas_xform,Control* p_canvas);
+	bool forward_gui_input(const Transform2D &p_canvas_xform, const InputEvent &p_event);
+	bool forward_spatial_gui_input(Camera *p_camera, const InputEvent &p_event);
+	void forward_draw_over_canvas(const Transform2D &p_canvas_xform, Control *p_canvas);
 	void clear();
 	bool empty();
 
 	EditorPluginList();
 	~EditorPluginList();
-
-} ;
+};
 
 struct EditorProgressBG {
 
 	String task;
-	void step(int p_step=-1) { EditorNode::progress_task_step_bg(task,p_step); }
-	EditorProgressBG(const String& p_task,const String& p_label,int p_amount) { EditorNode::progress_add_task_bg(p_task,p_label,p_amount); task=p_task; }
+	void step(int p_step = -1) { EditorNode::progress_task_step_bg(task, p_step); }
+	EditorProgressBG(const String &p_task, const String &p_label, int p_amount) {
+		EditorNode::progress_add_task_bg(p_task, p_label, p_amount);
+		task = p_task;
+	}
 	~EditorProgressBG() { EditorNode::progress_end_task_bg(task); }
 };