diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 13:23:58 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:54:55 +0200 |
commit | 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (patch) | |
tree | a27e497da7104dd0a64f98a04fa3067668735e91 /editor/editor_folding.cpp | |
parent | 710b34b70227becdc652b4ae027fe0ac47409642 (diff) |
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.
This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.
There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).
Part of #33027.
Diffstat (limited to 'editor/editor_folding.cpp')
-rw-r--r-- | editor/editor_folding.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp index 507a77e641..270495ff55 100644 --- a/editor/editor_folding.cpp +++ b/editor/editor_folding.cpp @@ -35,7 +35,6 @@ #include "editor_settings.h" Vector<String> EditorFolding::_get_unfolds(const Object *p_object) { - Vector<String> sections; sections.resize(p_object->editor_get_section_folding().size()); if (sections.size()) { @@ -61,7 +60,6 @@ void EditorFolding::save_resource_folding(const RES &p_resource, const String &p } void EditorFolding::_set_unfolds(Object *p_object, const Vector<String> &p_unfolds) { - int uc = p_unfolds.size(); const String *r = p_unfolds.ptr(); p_object->editor_clear_section_folding(); @@ -71,7 +69,6 @@ void EditorFolding::_set_unfolds(Object *p_object, const Vector<String> &p_unfol } void EditorFolding::load_resource_folding(RES p_resource, const String &p_path) { - Ref<ConfigFile> config; config.instance(); @@ -117,7 +114,6 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p if (E->get().type == Variant::OBJECT) { RES res = p_node->get(E->get().name); if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) { - Vector<String> res_unfolds = _get_unfolds(res.ptr()); resource_folds.push_back(res->get_path()); resource_folds.push_back(res_unfolds); @@ -132,7 +128,6 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p } } void EditorFolding::save_scene_folding(const Node *p_scene, const String &p_path) { - ERR_FAIL_NULL(p_scene); FileAccessRef file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES); @@ -156,7 +151,6 @@ void EditorFolding::save_scene_folding(const Node *p_scene, const String &p_path config->save(file); } void EditorFolding::load_scene_folding(Node *p_scene, const String &p_path) { - Ref<ConfigFile> config; config.instance(); @@ -218,14 +212,12 @@ void EditorFolding::load_scene_folding(Node *p_scene, const String &p_path) { } bool EditorFolding::has_folding_data(const String &p_path) { - String file = p_path.get_file() + "-folding-" + p_path.md5_text() + ".cfg"; file = EditorSettings::get_singleton()->get_project_settings_dir().plus_file(file); return FileAccess::exists(file); } void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) { - List<PropertyInfo> plist; p_object->get_property_list(&plist); String group_base; @@ -234,7 +226,6 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) { Set<String> unfold_group; for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { - if (E->get().usage & PROPERTY_USAGE_CATEGORY) { group = ""; group_base = ""; @@ -249,7 +240,6 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) { //can unfold if (E->get().usage & PROPERTY_USAGE_EDITOR) { - if (group != "") { //group if (group_base == String() || E->get().name.begins_with(group_base)) { bool can_revert = EditorPropertyRevert::can_property_revert(p_object, E->get().name); @@ -271,7 +261,6 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set<RES> &resources) { if (E->get().type == Variant::OBJECT) { RES res = p_object->get(E->get().name); if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) { - resources.insert(res); _do_object_unfolds(res.ptr(), resources); } @@ -301,7 +290,6 @@ void EditorFolding::_do_node_unfolds(Node *p_root, Node *p_node, Set<RES> &resou } void EditorFolding::unfold_scene(Node *p_scene) { - Set<RES> resources; _do_node_unfolds(p_scene, p_scene, resources); } |