diff options
| author | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /editor/project_settings.h | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
| download | godot-5dbf180.tar.gz godot-5dbf180.tar.zst godot-5dbf180.zip | |
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/project_settings.h')
| -rw-r--r-- | editor/project_settings.h | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/editor/project_settings.h b/editor/project_settings.h index 96ac2e2c1..892198e00 100644 --- a/editor/project_settings.h +++ b/editor/project_settings.h @@ -29,19 +29,18 @@ #ifndef PROJECT_SETTINGS_H #define PROJECT_SETTINGS_H -#include "scene/gui/dialogs.h" -#include "property_editor.h" -#include "undo_redo.h" -#include "editor_data.h" -#include "scene/gui/tab_container.h" #include "editor_autoload_settings.h" +#include "editor_data.h" #include "editor_plugin_settings.h" +#include "property_editor.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/tab_container.h" +#include "undo_redo.h" //#include "project_export_settings.h" class ProjectSettings : public AcceptDialog { - GDCLASS( ProjectSettings, AcceptDialog ); - + GDCLASS(ProjectSettings, AcceptDialog); TabContainer *tab_container; @@ -65,7 +64,7 @@ class ProjectSettings : public AcceptDialog { OptionButton *type; PopupMenu *popup_add; ConfirmationDialog *press_a_key; - Label*press_a_key_label; + Label *press_a_key_label; ConfirmationDialog *device_input; SpinBox *device_id; OptionButton *device_index; @@ -82,7 +81,6 @@ class ProjectSettings : public AcceptDialog { EditorFileDialog *translation_file_open; Tree *translation_list; - Button *translation_res_option_add_button; EditorFileDialog *translation_res_file_open; EditorFileDialog *translation_res_option_file_open; @@ -105,59 +103,53 @@ class ProjectSettings : public AcceptDialog { void _action_add(); void _device_input_add(); - void _item_checked(const String& p_item, bool p_check); + void _item_checked(const String &p_item, bool p_check); void _action_selected(); void _action_edited(); - void _action_button_pressed(Object* p_obj, int p_column,int p_id); - void _wait_for_key(const InputEvent& p_event); + void _action_button_pressed(Object *p_obj, int p_column, int p_id); + void _wait_for_key(const InputEvent &p_event); void _press_a_key_confirm(); - void _show_last_added(const InputEvent& p_event, const String& p_name); + void _show_last_added(const InputEvent &p_event, const String &p_name); - void _settings_prop_edited(const String& p_name); + void _settings_prop_edited(const String &p_name); void _settings_changed(); //ProjectExportSettings *export_settings; void _copy_to_platform(int p_which); - void _translation_file_open(); - void _translation_add(const String& p_path); - void _translation_delete(Object *p_item,int p_column, int p_button); + void _translation_add(const String &p_path); + void _translation_delete(Object *p_item, int p_column, int p_button); void _update_translations(); void _translation_res_file_open(); - void _translation_res_add(const String& p_path); - void _translation_res_delete(Object *p_item,int p_column, int p_button); + void _translation_res_add(const String &p_path); + void _translation_res_delete(Object *p_item, int p_column, int p_button); void _translation_res_select(); void _translation_res_option_file_open(); - void _translation_res_option_add(const String& p_path); + void _translation_res_option_add(const String &p_path); void _translation_res_option_changed(); - void _translation_res_option_delete(Object *p_item,int p_column, int p_button); + void _translation_res_option_delete(Object *p_item, int p_column, int p_button); void _toggle_search_bar(bool p_pressed); void _clear_search_box(); - - ProjectSettings(); - static ProjectSettings *singleton; -protected: +protected: void _notification(int p_what); static void _bind_methods(); public: - - void add_translation(const String& p_translation); + void add_translation(const String &p_translation); static ProjectSettings *get_singleton() { return singleton; } void popup_project_settings(); void set_plugins_page(); void queue_save(); - ProjectSettings(EditorData *p_data); }; |
