diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-09 22:39:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 22:39:29 +0200 |
| commit | ab7e7b8116be3f9c7e9a6ad9ef07c3c08936d8b6 (patch) | |
| tree | 9ccaa24fb75a3b61c9b2e2afd3956abe0b4969a2 /editor/editor_settings.h | |
| parent | 9a1173c02425ef349dff2fe74e6f595cec73201b (diff) | |
| parent | 3e0226515eec5f904701fce36c7856617d3ca6b8 (diff) | |
Merge pull request #41926 from Calinou/rename-shortcut-sentence-case
Rename ShortCut to Shortcut which is more grammatically correct
Diffstat (limited to 'editor/editor_settings.h')
| -rw-r--r-- | editor/editor_settings.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 13aebb7ea6..4896fb58db 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -85,7 +85,7 @@ private: int last_order; Ref<Resource> clipboard; - Map<String, Ref<ShortCut>> shortcuts; + Map<String, Ref<Shortcut>> shortcuts; String resource_path; String settings_dir; @@ -182,9 +182,9 @@ public: Vector<String> get_script_templates(const String &p_extension, const String &p_custom_path = String()); String get_editor_layouts_config() const; - void add_shortcut(const String &p_name, Ref<ShortCut> &p_shortcut); + void add_shortcut(const String &p_name, Ref<Shortcut> &p_shortcut); bool is_shortcut(const String &p_name, const Ref<InputEvent> &p_event) const; - Ref<ShortCut> get_shortcut(const String &p_name) const; + Ref<Shortcut> get_shortcut(const String &p_name) const; void get_shortcut_list(List<String> *r_shortcuts); void notify_changes(); @@ -203,7 +203,7 @@ Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default, bool p_re Variant _EDITOR_GET(const String &p_setting); #define ED_IS_SHORTCUT(p_name, p_ev) (EditorSettings::get_singleton()->is_shortcut(p_name, p_ev)) -Ref<ShortCut> ED_SHORTCUT(const String &p_path, const String &p_name, uint32_t p_keycode = 0); -Ref<ShortCut> ED_GET_SHORTCUT(const String &p_path); +Ref<Shortcut> ED_SHORTCUT(const String &p_path, const String &p_name, uint32_t p_keycode = 0); +Ref<Shortcut> ED_GET_SHORTCUT(const String &p_path); #endif // EDITOR_SETTINGS_H |