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.
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 /scene/resources/theme.cpp
parent: 710b34b70227becdc652b4ae027fe0ac47409642 (diff)
download: redot-engine-0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a.tar.gz
1 files changed, 0 insertions, 87 deletions
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 325ada69ea..7a28927583 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -33,12 +33,10 @@
 #include "core/print_string.h"
 
 void Theme::_emit_theme_changed() {
-
 	emit_changed();
 }
 
 Vector<String> Theme::_get_icon_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -54,7 +52,6 @@ Vector<String> Theme::_get_icon_list(const String &p_type) const {
 }
 
 Vector<String> Theme::_get_stylebox_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -70,7 +67,6 @@ Vector<String> Theme::_get_stylebox_list(const String &p_type) const {
 }
 
 Vector<String> Theme::_get_stylebox_types() const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -86,7 +82,6 @@ Vector<String> Theme::_get_stylebox_types() const {
 }
 
 Vector<String> Theme::_get_font_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -102,7 +97,6 @@ Vector<String> Theme::_get_font_list(const String &p_type) const {
 }
 
 Vector<String> Theme::_get_color_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -118,7 +112,6 @@ Vector<String> Theme::_get_color_list(const String &p_type) const {
 }
 
 Vector<String> Theme::_get_constant_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -134,7 +127,6 @@ Vector<String> Theme::_get_constant_list(const String &p_type) const {
 }
 
 Vector<String> Theme::_get_type_list(const String &p_type) const {
-
 	Vector<String> ilret;
 	List<StringName> il;
 
@@ -150,29 +142,22 @@ Vector<String> Theme::_get_type_list(const String &p_type) const {
 }
 
 bool Theme::_set(const StringName &p_name, const Variant &p_value) {
-
 	String sname = p_name;
 
 	if (sname.find("/") != -1) {
-
 		String type = sname.get_slicec('/', 1);
 		String node_type = sname.get_slicec('/', 0);
 		String name = sname.get_slicec('/', 2);
 
 		if (type == "icons") {
-
 			set_icon(name, node_type, p_value);
 		} else if (type == "styles") {
-
 			set_stylebox(name, node_type, p_value);
 		} else if (type == "fonts") {
-
 			set_font(name, node_type, p_value);
 		} else if (type == "colors") {
-
 			set_color(name, node_type, p_value);
 		} else if (type == "constants") {
-
 			set_constant(name, node_type, p_value);
 		} else
 			return false;
@@ -184,38 +169,31 @@ bool Theme::_set(const StringName &p_name, const Variant &p_value) {
 }
 
 bool Theme::_get(const StringName &p_name, Variant &r_ret) const {
-
 	String sname = p_name;
 
 	if (sname.find("/") != -1) {
-
 		String type = sname.get_slicec('/', 1);
 		String node_type = sname.get_slicec('/', 0);
 		String name = sname.get_slicec('/', 2);
 
 		if (type == "icons") {
-
 			if (!has_icon(name, node_type))
 				r_ret = Ref<Texture2D>();
 			else
 				r_ret = get_icon(name, node_type);
 		} else if (type == "styles") {
-
 			if (!has_stylebox(name, node_type))
 				r_ret = Ref<StyleBox>();
 			else
 				r_ret = get_stylebox(name, node_type);
 		} else if (type == "fonts") {
-
 			if (!has_font(name, node_type))
 				r_ret = Ref<Font>();
 			else
 				r_ret = get_font(name, node_type);
 		} else if (type == "colors") {
-
 			r_ret = get_color(name, node_type);
 		} else if (type == "constants") {
-
 			r_ret = get_constant(name, node_type);
 		} else
 			return false;
@@ -227,17 +205,14 @@ bool Theme::_get(const StringName &p_name, Variant &r_ret) const {
 }
 
 void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
-
 	List<PropertyInfo> list;
 
 	const StringName *key = nullptr;
 
 	while ((key = icon_map.next(key))) {
-
 		const StringName *key2 = nullptr;
 
 		while ((key2 = icon_map[*key].next(key2))) {
-
 			list.push_back(PropertyInfo(Variant::OBJECT, String() + *key + "/icons/" + *key2, PROPERTY_HINT_RESOURCE_TYPE, "Texture2D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
@@ -245,11 +220,9 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	key = nullptr;
 
 	while ((key = style_map.next(key))) {
-
 		const StringName *key2 = nullptr;
 
 		while ((key2 = style_map[*key].next(key2))) {
-
 			list.push_back(PropertyInfo(Variant::OBJECT, String() + *key + "/styles/" + *key2, PROPERTY_HINT_RESOURCE_TYPE, "StyleBox", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
@@ -257,11 +230,9 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	key = nullptr;
 
 	while ((key = font_map.next(key))) {
-
 		const StringName *key2 = nullptr;
 
 		while ((key2 = font_map[*key].next(key2))) {
-
 			list.push_back(PropertyInfo(Variant::OBJECT, String() + *key + "/fonts/" + *key2, PROPERTY_HINT_RESOURCE_TYPE, "Font", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_STORE_IF_NULL));
 		}
 	}
@@ -269,11 +240,9 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	key = nullptr;
 
 	while ((key = color_map.next(key))) {
-
 		const StringName *key2 = nullptr;
 
 		while ((key2 = color_map[*key].next(key2))) {
-
 			list.push_back(PropertyInfo(Variant::COLOR, String() + *key + "/colors/" + *key2));
 		}
 	}
@@ -281,11 +250,9 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	key = nullptr;
 
 	while ((key = constant_map.next(key))) {
-
 		const StringName *key2 = nullptr;
 
 		while ((key2 = constant_map[*key].next(key2))) {
-
 			list.push_back(PropertyInfo(Variant::INT, String() + *key + "/constants/" + *key2));
 		}
 	}
@@ -297,7 +264,6 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void Theme::set_default_theme_font(const Ref<Font> &p_default_font) {
-
 	if (default_theme_font == p_default_font)
 		return;
 
@@ -316,7 +282,6 @@ void Theme::set_default_theme_font(const Ref<Font> &p_default_font) {
 }
 
 Ref<Font> Theme::get_default_theme_font() const {
-
 	return default_theme_font;
 }
 
@@ -327,40 +292,32 @@ Ref<StyleBox> Theme::default_style;
 Ref<Font> Theme::default_font;
 
 Ref<Theme> Theme::get_default() {
-
 	return default_theme;
 }
 
 void Theme::set_default(const Ref<Theme> &p_default) {
-
 	default_theme = p_default;
 }
 
 Ref<Theme> Theme::get_project_default() {
-
 	return project_default_theme;
 }
 
 void Theme::set_project_default(const Ref<Theme> &p_project_default) {
-
 	project_default_theme = p_project_default;
 }
 
 void Theme::set_default_icon(const Ref<Texture2D> &p_icon) {
-
 	default_icon = p_icon;
 }
 void Theme::set_default_style(const Ref<StyleBox> &p_style) {
-
 	default_style = p_style;
 }
 void Theme::set_default_font(const Ref<Font> &p_font) {
-
 	default_font = p_font;
 }
 
 void Theme::set_icon(const StringName &p_name, const StringName &p_type, const Ref<Texture2D> &p_icon) {
-
 	//ERR_FAIL_COND(p_icon.is_null());
 
 	bool new_value = !icon_map.has(p_type) || !icon_map[p_type].has(p_name);
@@ -381,9 +338,7 @@ void Theme::set_icon(const StringName &p_name, const StringName &p_type, const R
 	}
 }
 Ref<Texture2D> Theme::get_icon(const StringName &p_name, const StringName &p_type) const {
-
 	if (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid()) {
-
 		return icon_map[p_type][p_name];
 	} else {
 		return default_icon;
@@ -391,12 +346,10 @@ Ref<Texture2D> Theme::get_icon(const StringName &p_name, const StringName &p_typ
 }
 
 bool Theme::has_icon(const StringName &p_name, const StringName &p_type) const {
-
 	return (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid());
 }
 
 void Theme::clear_icon(const StringName &p_name, const StringName &p_type) {
-
 	ERR_FAIL_COND(!icon_map.has(p_type));
 	ERR_FAIL_COND(!icon_map[p_type].has(p_name));
 
@@ -411,7 +364,6 @@ void Theme::clear_icon(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_icon_list(StringName p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!icon_map.has(p_type))
@@ -420,7 +372,6 @@ void Theme::get_icon_list(StringName p_type, List<StringName> *p_list) const {
 	const StringName *key = nullptr;
 
 	while ((key = icon_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
@@ -458,7 +409,6 @@ void Theme::clear_shader(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!shader_map.has(p_type))
@@ -467,13 +417,11 @@ void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list)
 	const StringName *key = nullptr;
 
 	while ((key = shader_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
 
 void Theme::set_stylebox(const StringName &p_name, const StringName &p_type, const Ref<StyleBox> &p_style) {
-
 	//ERR_FAIL_COND(p_style.is_null());
 
 	bool new_value = !style_map.has(p_type) || !style_map[p_type].has(p_name);
@@ -494,9 +442,7 @@ void Theme::set_stylebox(const StringName &p_name, const StringName &p_type, con
 }
 
 Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_type) const {
-
 	if (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid()) {
-
 		return style_map[p_type][p_name];
 	} else {
 		return default_style;
@@ -504,12 +450,10 @@ Ref<StyleBox> Theme::get_stylebox(const StringName &p_name, const StringName &p_
 }
 
 bool Theme::has_stylebox(const StringName &p_name, const StringName &p_type) const {
-
 	return (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid());
 }
 
 void Theme::clear_stylebox(const StringName &p_name, const StringName &p_type) {
-
 	ERR_FAIL_COND(!style_map.has(p_type));
 	ERR_FAIL_COND(!style_map[p_type].has(p_name));
 
@@ -524,7 +468,6 @@ void Theme::clear_stylebox(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_stylebox_list(StringName p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!style_map.has(p_type))
@@ -533,7 +476,6 @@ void Theme::get_stylebox_list(StringName p_type, List<StringName> *p_list) const
 	const StringName *key = nullptr;
 
 	while ((key = style_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
@@ -548,7 +490,6 @@ void Theme::get_stylebox_types(List<StringName> *p_list) const {
 }
 
 void Theme::set_font(const StringName &p_name, const StringName &p_type, const Ref<Font> &p_font) {
-
 	//ERR_FAIL_COND(p_font.is_null());
 
 	bool new_value = !font_map.has(p_type) || !font_map[p_type].has(p_name);
@@ -569,7 +510,6 @@ void Theme::set_font(const StringName &p_name, const StringName &p_type, const R
 	}
 }
 Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_type) const {
-
 	if (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid())
 		return font_map[p_type][p_name];
 	else if (default_theme_font.is_valid())
@@ -579,12 +519,10 @@ Ref<Font> Theme::get_font(const StringName &p_name, const StringName &p_type) co
 }
 
 bool Theme::has_font(const StringName &p_name, const StringName &p_type) const {
-
 	return (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid());
 }
 
 void Theme::clear_font(const StringName &p_name, const StringName &p_type) {
-
 	ERR_FAIL_COND(!font_map.has(p_type));
 	ERR_FAIL_COND(!font_map[p_type].has(p_name));
 
@@ -598,7 +536,6 @@ void Theme::clear_font(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_font_list(StringName p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!font_map.has(p_type))
@@ -607,13 +544,11 @@ void Theme::get_font_list(StringName p_type, List<StringName> *p_list) const {
 	const StringName *key = nullptr;
 
 	while ((key = font_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
 
 void Theme::set_color(const StringName &p_name, const StringName &p_type, const Color &p_color) {
-
 	bool new_value = !color_map.has(p_type) || !color_map[p_type].has(p_name);
 
 	color_map[p_type][p_name] = p_color;
@@ -625,7 +560,6 @@ void Theme::set_color(const StringName &p_name, const StringName &p_type, const
 }
 
 Color Theme::get_color(const StringName &p_name, const StringName &p_type) const {
-
 	if (color_map.has(p_type) && color_map[p_type].has(p_name))
 		return color_map[p_type][p_name];
 	else
@@ -633,12 +567,10 @@ Color Theme::get_color(const StringName &p_name, const StringName &p_type) const
 }
 
 bool Theme::has_color(const StringName &p_name, const StringName &p_type) const {
-
 	return (color_map.has(p_type) && color_map[p_type].has(p_name));
 }
 
 void Theme::clear_color(const StringName &p_name, const StringName &p_type) {
-
 	ERR_FAIL_COND(!color_map.has(p_type));
 	ERR_FAIL_COND(!color_map[p_type].has(p_name));
 
@@ -648,7 +580,6 @@ void Theme::clear_color(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_color_list(StringName p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!color_map.has(p_type))
@@ -657,13 +588,11 @@ void Theme::get_color_list(StringName p_type, List<StringName> *p_list) const {
 	const StringName *key = nullptr;
 
 	while ((key = color_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
 
 void Theme::set_constant(const StringName &p_name, const StringName &p_type, int p_constant) {
-
 	bool new_value = !constant_map.has(p_type) || !constant_map[p_type].has(p_name);
 	constant_map[p_type][p_name] = p_constant;
 
@@ -674,7 +603,6 @@ void Theme::set_constant(const StringName &p_name, const StringName &p_type, int
 }
 
 int Theme::get_constant(const StringName &p_name, const StringName &p_type) const {
-
 	if (constant_map.has(p_type) && constant_map[p_type].has(p_name))
 		return constant_map[p_type][p_name];
 	else {
@@ -683,12 +611,10 @@ int Theme::get_constant(const StringName &p_name, const StringName &p_type) cons
 }
 
 bool Theme::has_constant(const StringName &p_name, const StringName &p_type) const {
-
 	return (constant_map.has(p_type) && constant_map[p_type].has(p_name));
 }
 
 void Theme::clear_constant(const StringName &p_name, const StringName &p_type) {
-
 	ERR_FAIL_COND(!constant_map.has(p_type));
 	ERR_FAIL_COND(!constant_map[p_type].has(p_name));
 
@@ -698,7 +624,6 @@ void Theme::clear_constant(const StringName &p_name, const StringName &p_type) {
 }
 
 void Theme::get_constant_list(StringName p_type, List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	if (!constant_map.has(p_type))
@@ -707,13 +632,11 @@ void Theme::get_constant_list(StringName p_type, List<StringName> *p_list) const
 	const StringName *key = nullptr;
 
 	while ((key = constant_map[p_type].next(key))) {
-
 		p_list->push_back(*key);
 	}
 }
 
 void Theme::clear() {
-
 	//these need disconnecting
 	{
 		const StringName *K = nullptr;
@@ -766,13 +689,11 @@ void Theme::clear() {
 }
 
 void Theme::copy_default_theme() {
-
 	Ref<Theme> default_theme2 = get_default();
 	copy_theme(default_theme2);
 }
 
 void Theme::copy_theme(const Ref<Theme> &p_other) {
-
 	if (p_other.is_null()) {
 		clear();
 
@@ -821,53 +742,45 @@ void Theme::copy_theme(const Ref<Theme> &p_other) {
 }
 
 void Theme::get_type_list(List<StringName> *p_list) const {
-
 	ERR_FAIL_NULL(p_list);
 
 	Set<StringName> types;
 	const StringName *key = nullptr;
 
 	while ((key = icon_map.next(key))) {
-
 		types.insert(*key);
 	}
 
 	key = nullptr;
 
 	while ((key = style_map.next(key))) {
-
 		types.insert(*key);
 	}
 
 	key = nullptr;
 
 	while ((key = font_map.next(key))) {
-
 		types.insert(*key);
 	}
 
 	key = nullptr;
 
 	while ((key = color_map.next(key))) {
-
 		types.insert(*key);
 	}
 
 	key = nullptr;
 
 	while ((key = constant_map.next(key))) {
-
 		types.insert(*key);
 	}
 
 	for (Set<StringName>::Element *E = types.front(); E; E = E->next()) {
-
 		p_list->push_back(E->get());
 	}
 }
 
 void Theme::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_icon", "name", "type", "texture"), &Theme::set_icon);
 	ClassDB::bind_method(D_METHOD("get_icon", "name", "type"), &Theme::get_icon);
 	ClassDB::bind_method(D_METHOD("has_icon", "name", "type"), &Theme::has_icon);
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 /scene/resources/theme.cpp
parent	710b34b70227becdc652b4ae027fe0ac47409642 (diff)
download	redot-engine-0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a.tar.gz