noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix missed renamings from empty() to is_empty()

Browse Source 
Those were missed in #44401 or added by later PRs.
This commit is contained in:
Rémi Verschelde
2020-12-29 09:54:59 +01:00
parent c6e9d912e1
commit 09212fba1e
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/mono_gd/support/android_support.cpp
View File

@@ -134,7 +134,7 @@ String determine_app_native_lib_dir() {
}
String get_app_native_lib_dir() {
if (app_native_lib_dir_cache.empty())
if (app_native_lib_dir_cache.is_empty())
app_native_lib_dir_cache = determine_app_native_lib_dir();
return app_native_lib_dir_cache;
}

2
modules/mono/utils/mono_reg_utils.cpp
View File

@@ -188,7 +188,7 @@ String find_msbuild_tools_path() {
if (key == "installationPath") {
String val = line.substr(sep_idx + 1, line.length()).strip_edges();
ERR_BREAK(val.empty());
ERR_BREAK(val.is_empty());
if (!val.ends_with("\\")) {
val += "\\";

2
modules/text_server_fb/dynamic_font_fb.cpp
View File

@@ -54,7 +54,7 @@ DynamicFontDataFallback::DataAtSize *DynamicFontDataFallback::get_data_for_size(
fds = E->get();
} else {
if (font_mem == nullptr && font_path != String()) {
if (!font_mem_cache.empty()) {
if (!font_mem_cache.is_empty()) {
font_mem = font_mem_cache.ptr();
font_mem_size = font_mem_cache.size();
} else {

4
modules/text_server_fb/text_server_fb.cpp
View File

@@ -550,7 +550,7 @@ bool TextServerFallback::shaped_text_add_string(RID p_shaped, const String &p_te
ERR_FAIL_COND_V(!sd, false);
ERR_FAIL_COND_V(p_size <= 0, false);
if (p_text.empty()) {
if (p_text.is_empty()) {
return true;
}
@@ -573,7 +573,7 @@ bool TextServerFallback::shaped_text_add_string(RID p_shaped, const String &p_te
span.fonts.push_back(p_fonts[i]);
}
}
ERR_FAIL_COND_V(span.fonts.empty(), false);
ERR_FAIL_COND_V(span.fonts.is_empty(), false);
span.font_size = p_size;
span.language = p_language;