diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /editor/property_selector.h | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) |
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
Diffstat (limited to 'editor/property_selector.h')
-rw-r--r-- | editor/property_selector.h | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/editor/property_selector.h b/editor/property_selector.h index c2ce996be2..c6903ee680 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -30,22 +30,21 @@ #define PROPERTYSELECTOR_H #include "editor/property_editor.h" -#include "scene/gui/rich_text_label.h" #include "editor_help.h" +#include "scene/gui/rich_text_label.h" class PropertySelector : public ConfirmationDialog { - GDCLASS(PropertySelector,ConfirmationDialog ) - + GDCLASS(PropertySelector, ConfirmationDialog) LineEdit *search_box; Tree *search_options; void _update_search(); - void _sbox_input(const InputEvent& p_ie); + void _sbox_input(const InputEvent &p_ie); void _confirmed(); - void _text_changed(const String& p_newtext); + void _text_changed(const String &p_newtext); EditorHelpBit *help_bit; @@ -58,24 +57,21 @@ class PropertySelector : public ConfirmationDialog { Object *instance; void _item_selected(); + protected: void _notification(int p_what); static void _bind_methods(); - - public: - - - void select_method_from_base_type(const String& p_base,const String& p_current=""); - void select_method_from_script(const Ref<Script>& p_script,const String& p_current=""); - void select_method_from_basic_type(Variant::Type p_type,const String& p_current=""); - void select_method_from_instance(Object* p_instance, const String &p_current=""); - - void select_property_from_base_type(const String& p_base,const String& p_current=""); - void select_property_from_script(const Ref<Script>& p_script,const String& p_current=""); - void select_property_from_basic_type(Variant::Type p_type,InputEvent::Type p_event_type,const String& p_current=""); - void select_property_from_instance(Object* p_instance, const String &p_current=""); + void select_method_from_base_type(const String &p_base, const String &p_current = ""); + void select_method_from_script(const Ref<Script> &p_script, const String &p_current = ""); + void select_method_from_basic_type(Variant::Type p_type, const String &p_current = ""); + void select_method_from_instance(Object *p_instance, const String &p_current = ""); + + void select_property_from_base_type(const String &p_base, const String &p_current = ""); + void select_property_from_script(const Ref<Script> &p_script, const String &p_current = ""); + void select_property_from_basic_type(Variant::Type p_type, InputEvent::Type p_event_type, const String &p_current = ""); + void select_property_from_instance(Object *p_instance, const String &p_current = ""); PropertySelector(); }; |