From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- editor/plugins/tile_set_editor_plugin.h | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'editor/plugins/tile_set_editor_plugin.h') diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index ffdc24192..19ffd4f2f 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -29,16 +29,13 @@ #ifndef TILE_SET_EDITOR_PLUGIN_H #define TILE_SET_EDITOR_PLUGIN_H - - -#include "scene/resources/tile_set.h" -#include "editor/editor_node.h" #include "editor/editor_name_dialog.h" - +#include "editor/editor_node.h" +#include "scene/resources/tile_set.h" class TileSetEditor : public Control { - OBJ_TYPE( TileSetEditor, Control ); + OBJ_TYPE(TileSetEditor, Control); Ref tileset; @@ -59,43 +56,35 @@ class TileSetEditor : public Control { int option; void _menu_cbk(int p_option); void _menu_confirm(); - void _name_dialog_confirm(const String& name); + void _name_dialog_confirm(const String &name); static void _import_scene(Node *p_scene, Ref p_library, bool p_merge); - protected: static void _bind_methods(); -public: - void edit(const Ref& p_tileset); - static Error update_library_file(Node *p_base_scene, Ref ml,bool p_merge=true); +public: + void edit(const Ref &p_tileset); + static Error update_library_file(Node *p_base_scene, Ref ml, bool p_merge = true); TileSetEditor(EditorNode *p_editor); }; - - class TileSetEditorPlugin : public EditorPlugin { - OBJ_TYPE( TileSetEditorPlugin, EditorPlugin ); + OBJ_TYPE(TileSetEditorPlugin, EditorPlugin); TileSetEditor *tileset_editor; EditorNode *editor; public: - virtual String get_name() const { return "TileSet"; } bool has_main_screen() const { return false; } virtual void edit(Object *p_node); virtual bool handles(Object *p_node) const; virtual void make_visible(bool p_visible); - - TileSetEditorPlugin(EditorNode *p_node); - }; - #endif // TILE_SET_EDITOR_PLUGIN_H -- cgit v1.3.1