diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-25 08:37:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 08:37:38 +0200 |
| commit | 490aef93699abc00da58f73b1596fb3473fd53c6 (patch) | |
| tree | 7912c7a540eca6b09392bbd2aa2f30fefe37f51a /editor/project_settings_editor.cpp | |
| parent | b1c0e45b03aa14453846c9a888763077eef2476b (diff) | |
| parent | cacced7e507f7603bacc03ae2616e58f0ede122a (diff) | |
| download | redot-engine-490aef93699abc00da58f73b1596fb3473fd53c6.tar.gz | |
Merge pull request #10581 from hpvb/fix-gcc6+
Make cast_to a static member of Object.
Diffstat (limited to 'editor/project_settings_editor.cpp')
| -rw-r--r-- | editor/project_settings_editor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 019ed47e81..c221a551ba 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -505,7 +505,7 @@ void ProjectSettingsEditor::_action_activated() { void ProjectSettingsEditor::_action_button_pressed(Object *p_obj, int p_column, int p_id) { - TreeItem *ti = p_obj->cast_to<TreeItem>(); + TreeItem *ti = Object::cast_to<TreeItem>(p_obj); ERR_FAIL_COND(!ti); @@ -1010,7 +1010,7 @@ void ProjectSettingsEditor::_translation_file_open() { void ProjectSettingsEditor::_translation_delete(Object *p_item, int p_column, int p_button) { - TreeItem *ti = p_item->cast_to<TreeItem>(); + TreeItem *ti = Object::cast_to<TreeItem>(p_item); ERR_FAIL_COND(!ti); int idx = ti->get_metadata(0); @@ -1151,7 +1151,7 @@ void ProjectSettingsEditor::_translation_res_delete(Object *p_item, int p_column Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps"); - TreeItem *k = p_item->cast_to<TreeItem>(); + TreeItem *k = Object::cast_to<TreeItem>(p_item); String key = k->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); @@ -1180,7 +1180,7 @@ void ProjectSettingsEditor::_translation_res_option_delete(Object *p_item, int p TreeItem *k = translation_remap->get_selected(); ERR_FAIL_COND(!k); - TreeItem *ed = p_item->cast_to<TreeItem>(); + TreeItem *ed = Object::cast_to<TreeItem>(p_item); ERR_FAIL_COND(!ed); String key = k->get_metadata(0); |