godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +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

42
core/resource.cpp
View File

@@ -46,8 +46,9 @@ void Resource::_resource_path_changed() {
}
void Resource::set_path(const String &p_path, bool p_take_over) {
if (path_cache == p_path)
if (path_cache == p_path) {
return;
}
if (path_cache != "") {
ResourceCache::lock->write_lock();
@@ -116,22 +117,26 @@ bool Resource::editor_can_reload_from_file() {
void Resource::reload_from_file() {
String path = get_path();
if (!path.is_resource_file())
if (!path.is_resource_file()) {
return;
}
Ref<Resource> s = ResourceLoader::load(ResourceLoader::path_remap(path), get_class(), true);
if (!s.is_valid())
if (!s.is_valid()) {
return;
}
List<PropertyInfo> pi;
s->get_property_list(&pi);
for (List<PropertyInfo>::Element *E = pi.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
continue;
if (E->get().name == "resource_path")
}
if (E->get().name == "resource_path") {
continue; //do not change path
}
set(E->get().name, s->get(E->get().name));
}
@@ -147,8 +152,9 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
r->local_scene = p_for_scene;
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
continue;
}
Variant p = get(E->get().name);
if (p.get_type() == Variant::OBJECT) {
RES sr = p;
@@ -180,8 +186,9 @@ void Resource::configure_for_local_scene(Node *p_for_scene, Map<Ref<Resource>, R
local_scene = p_for_scene;
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
continue;
}
Variant p = get(E->get().name);
if (p.get_type() == Variant::OBJECT) {
RES sr = p;
@@ -205,8 +212,9 @@ Ref<Resource> Resource::duplicate(bool p_subresources) const {
ERR_FAIL_COND_V(!r, Ref<Resource>());
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (!(E->get().usage & PROPERTY_USAGE_STORAGE))
if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
continue;
}
Variant p = get(E->get().name);
if ((p.get_type() == Variant::DICTIONARY || p.get_type() == Variant::ARRAY)) {
@@ -284,8 +292,9 @@ bool Resource::is_local_to_scene() const {
}
Node *Resource::get_local_scene() const {
if (local_scene)
if (local_scene) {
return local_scene;
}
if (_get_local_scene_func) {
return _get_local_scene_func();
@@ -295,15 +304,17 @@ Node *Resource::get_local_scene() const {
}
void Resource::setup_local_to_scene() {
if (get_script_instance())
if (get_script_instance()) {
get_script_instance()->call("_setup_local_to_scene");
}
}
Node *(*Resource::_get_local_scene_func)() = nullptr;
void Resource::set_as_translation_remapped(bool p_remapped) {
if (remapped_list.in_list() == p_remapped)
if (remapped_list.in_list() == p_remapped) {
return;
}
if (ResourceCache::lock) {
ResourceCache::lock->write_lock();
@@ -419,8 +430,9 @@ void ResourceCache::setup() {
}
void ResourceCache::clear() {
if (resources.size())
if (resources.size()) {
ERR_PRINT("Resources Still in use at Exit!");
}
resources.clear();
memdelete(lock);
@@ -501,14 +513,16 @@ void ResourceCache::dump(const char *p_file, bool p_short) {
type_count[r->get_class()]++;
if (!p_short) {
if (f)
if (f) {
f->store_line(r->get_class() + ": " + r->get_path());
}
}
}
for (Map<String, int>::Element *E = type_count.front(); E; E = E->next()) {
if (f)
if (f) {
f->store_line(E->key() + " count: " + itos(E->get()));
}
}
if (f) {
f->close();