diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-26 22:32:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 22:32:50 +0200 |
| commit | 639b02f4541be289a10f2e7bc80fd1ea67e4cf32 (patch) | |
| tree | 999ab45ae185e456b7b455502a3de2edac9cbed3 /editor | |
| parent | f6e5ea774ba071e995a2c7a3f225285d9e708c5a (diff) | |
| parent | 5d124c4a8f86176e8adafab3d3703f28e597cb12 (diff) | |
Merge pull request #48185 from Calinou/codestyle-no-auto
Remove uses of `auto` for better readability and online code reviews
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_translation_parser.cpp | 2 | ||||
| -rw-r--r-- | editor/pot_generator.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_editor.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_translation_parser.cpp b/editor/editor_translation_parser.cpp index fd36372dde..49d5cf1fd3 100644 --- a/editor/editor_translation_parser.cpp +++ b/editor/editor_translation_parser.cpp @@ -105,7 +105,7 @@ void EditorTranslationParser::get_recognized_extensions(List<String> *r_extensio for (int i = 0; i < temp.size(); i++) { extensions.insert(temp[i]); } - for (auto E = extensions.front(); E; E = E->next()) { + for (Set<String>::Element *E = extensions.front(); E; E = E->next()) { r_extensions->push_back(E->get()); } } diff --git a/editor/pot_generator.cpp b/editor/pot_generator.cpp index 497cc0cbdc..b58b7e4cac 100644 --- a/editor/pot_generator.cpp +++ b/editor/pot_generator.cpp @@ -39,7 +39,7 @@ POTGenerator *POTGenerator::singleton = nullptr; #ifdef DEBUG_POT void POTGenerator::_print_all_translation_strings() { - for (auto E = all_translation_strings.front(); E; E = E.next()) { + for (OrderedHashMap<String, Vector<POTGenerator::MsgidData>>::Element E = all_translation_strings.front(); E; E = E.next()) { Vector<MsgidData> v_md = all_translation_strings[E.key()]; for (int i = 0; i < v_md.size(); i++) { print_line("++++++"); diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index ec37fa53b3..b4f7eda391 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -277,7 +277,7 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent, bool p_scroll } Ref<Texture2D> icon_temp; - auto signal_temp = BUTTON_SIGNALS; + SceneTreeEditorButton signal_temp = BUTTON_SIGNALS; if (num_connections >= 1 && num_groups >= 1) { icon_temp = get_theme_icon("SignalsAndGroups", "EditorIcons"); } else if (num_connections >= 1) { diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h index fd5157f04f..b4c27b7c1f 100644 --- a/editor/scene_tree_editor.h +++ b/editor/scene_tree_editor.h @@ -43,7 +43,7 @@ class SceneTreeEditor : public Control { EditorSelection *editor_selection; - enum { + enum SceneTreeEditorButton { BUTTON_SUBSCENE = 0, BUTTON_VISIBILITY = 1, BUTTON_SCRIPT = 2, |