Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bring that Whole New World to the Old Continent too

Browse source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde 2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download patch file Download diff file Expand all files Collapse all files

19
editor/settings_config_dialog.h
View file

@ -29,16 +29,13 @@
#ifndef SETTINGS_CONFIG_DIALOG_H
#define SETTINGS_CONFIG_DIALOG_H
#include "property_editor.h"
#include "scene/gui/tab_container.h"
#include "scene/gui/rich_text_label.h"
#include "scene/gui/tab_container.h"
class EditorSettingsDialog : public AcceptDialog {
OBJ_TYPE(EditorSettingsDialog,AcceptDialog);
OBJ_TYPE(EditorSettingsDialog, AcceptDialog);
bool updating;
@ -64,28 +61,26 @@ class EditorSettingsDialog : public AcceptDialog {
virtual void ok_pressed();
void _settings_changed();
void _settings_property_edited(const String& p_name);
void _settings_property_edited(const String &p_name);
void _settings_save();
void _notification(int p_what);
void _press_a_key_confirm();
void _wait_for_key(const InputEvent& p_event);
void _wait_for_key(const InputEvent &p_event);
void _clear_shortcut_search_box();
void _clear_search_box();
void _filter_shortcuts(const String& p_filter);
void _filter_shortcuts(const String &p_filter);
void _update_shortcuts();
void _shortcut_button_pressed(Object* p_item,int p_column,int p_idx);
void _shortcut_button_pressed(Object *p_item, int p_column, int p_idx);
protected:
static void _bind_methods();
public:
public:
void popup_edit_settings();
EditorSettingsDialog();