godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Style: Enforce braces around if blocks and loops

Browse Source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde
2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
editor/editor_path.cpp
View File

@@ -34,23 +34,28 @@
#include "editor_scale.h"
void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
if (p_depth > 8)
if (p_depth > 8) {
return;
}
List<PropertyInfo> pinfo;
p_obj->get_property_list(&pinfo);
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_EDITOR))
if (!(E->get().usage & PROPERTY_USAGE_EDITOR)) {
continue;
if (E->get().hint != PROPERTY_HINT_RESOURCE_TYPE)
}
if (E->get().hint != PROPERTY_HINT_RESOURCE_TYPE) {
continue;
}
Variant value = p_obj->get(E->get().name);
if (value.get_type() != Variant::OBJECT)
if (value.get_type() != Variant::OBJECT) {
continue;
}
Object *obj = value;
if (!obj)
if (!obj) {
continue;
}
Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(obj);
@@ -65,8 +70,9 @@ void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
void EditorPath::_about_to_show() {
Object *obj = ObjectDB::get_instance(history->get_path_object(history->get_path_size() - 1));
if (!obj)
if (!obj) {
return;
}
objects.clear();
get_popup()->clear();
@@ -82,32 +88,37 @@ void EditorPath::_about_to_show() {
void EditorPath::update_path() {
for (int i = 0; i < history->get_path_size(); i++) {
Object *obj = ObjectDB::get_instance(history->get_path_object(i));
if (!obj)
if (!obj) {
continue;
}
Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(obj);
if (icon.is_valid())
if (icon.is_valid()) {
set_icon(icon);
}
if (i == history->get_path_size() - 1) {
String name;
if (Object::cast_to<Resource>(obj)) {
Resource *r = Object::cast_to<Resource>(obj);
if (r->get_path().is_resource_file())
if (r->get_path().is_resource_file()) {
name = r->get_path().get_file();
else
} else {
name = r->get_name();
}
if (name == "")
if (name == "") {
name = r->get_class();
} else if (obj->is_class("EditorDebuggerRemoteObject"))
}
} else if (obj->is_class("EditorDebuggerRemoteObject")) {
name = obj->call("get_title");
else if (Object::cast_to<Node>(obj))
} else if (Object::cast_to<Node>(obj)) {
name = Object::cast_to<Node>(obj)->get_name();
else if (Object::cast_to<Resource>(obj) && Object::cast_to<Resource>(obj)->get_name() != "")
} else if (Object::cast_to<Resource>(obj) && Object::cast_to<Resource>(obj)->get_name() != "") {
name = Object::cast_to<Resource>(obj)->get_name();
else
} else {
name = obj->get_class();
}
set_text(" " + name); // An extra space so the text is not too close of the icon.
set_tooltip(obj->get_class());
@@ -119,8 +130,9 @@ void EditorPath::_id_pressed(int p_idx) {
ERR_FAIL_INDEX(p_idx, objects.size());
Object *obj = ObjectDB::get_instance(objects[p_idx]);
if (!obj)
if (!obj) {
return;
}
EditorNode::get_singleton()->push_item(obj);
}