You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
Replace String comparisons with "", String() to is_empty()
Also: - Adds two stress tests to test_string.h - Changes to .empty() on std::strings
This commit is contained in:
@@ -370,7 +370,7 @@ void VisualScriptFunctionCall::_update_method_cache() {
|
||||
|
||||
} else if (call_mode == CALL_MODE_INSTANCE) {
|
||||
type = base_type;
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -539,7 +539,7 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
|
||||
property.hint = PROPERTY_HINT_ENUM;
|
||||
String sl;
|
||||
for (const Engine::Singleton &E : names) {
|
||||
if (sl != String()) {
|
||||
if (!sl.is_empty()) {
|
||||
sl += ",";
|
||||
}
|
||||
sl += E.name;
|
||||
@@ -580,7 +580,7 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
|
||||
property.hint = PROPERTY_HINT_METHOD_OF_BASE_TYPE;
|
||||
property.hint_string = base_type;
|
||||
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -684,7 +684,7 @@ void VisualScriptFunctionCall::_bind_methods() {
|
||||
|
||||
String script_ext_hint;
|
||||
for (const String &E : script_extensions) {
|
||||
if (script_ext_hint != String()) {
|
||||
if (!script_ext_hint.is_empty()) {
|
||||
script_ext_hint += ",";
|
||||
}
|
||||
script_ext_hint += "*." + E;
|
||||
@@ -1161,7 +1161,7 @@ void VisualScriptPropertySet::_update_cache() {
|
||||
}
|
||||
} else if (call_mode == CALL_MODE_INSTANCE) {
|
||||
type = base_type;
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -1321,7 +1321,7 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
|
||||
property.hint = PROPERTY_HINT_PROPERTY_OF_BASE_TYPE;
|
||||
property.hint_string = base_type;
|
||||
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -1361,7 +1361,7 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
|
||||
property.hint = PROPERTY_HINT_ENUM;
|
||||
property.hint_string = options;
|
||||
property.type = Variant::STRING;
|
||||
if (options == "") {
|
||||
if (options.is_empty()) {
|
||||
property.usage = PROPERTY_USAGE_NONE; //hide if type has no usable index
|
||||
}
|
||||
}
|
||||
@@ -1411,7 +1411,7 @@ void VisualScriptPropertySet::_bind_methods() {
|
||||
|
||||
String script_ext_hint;
|
||||
for (const String &E : script_extensions) {
|
||||
if (script_ext_hint != String()) {
|
||||
if (!script_ext_hint.is_empty()) {
|
||||
script_ext_hint += ",";
|
||||
}
|
||||
script_ext_hint += "*." + E;
|
||||
@@ -1847,7 +1847,7 @@ void VisualScriptPropertyGet::_update_cache() {
|
||||
}
|
||||
} else if (call_mode == CALL_MODE_INSTANCE) {
|
||||
type = base_type;
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -2027,7 +2027,7 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
|
||||
property.hint = PROPERTY_HINT_PROPERTY_OF_BASE_TYPE;
|
||||
property.hint_string = base_type;
|
||||
|
||||
if (base_script != String()) {
|
||||
if (!base_script.is_empty()) {
|
||||
if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
|
||||
ScriptServer::edit_request_func(base_script); //make sure it's loaded
|
||||
}
|
||||
@@ -2066,7 +2066,7 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
|
||||
property.hint = PROPERTY_HINT_ENUM;
|
||||
property.hint_string = options;
|
||||
property.type = Variant::STRING;
|
||||
if (options == "") {
|
||||
if (options.is_empty()) {
|
||||
property.usage = PROPERTY_USAGE_NONE; //hide if type has no usable index
|
||||
}
|
||||
}
|
||||
@@ -2113,7 +2113,7 @@ void VisualScriptPropertyGet::_bind_methods() {
|
||||
|
||||
String script_ext_hint;
|
||||
for (const String &E : script_extensions) {
|
||||
if (script_ext_hint != String()) {
|
||||
if (!script_ext_hint.is_empty()) {
|
||||
script_ext_hint += ",";
|
||||
}
|
||||
script_ext_hint += "." + E;
|
||||
@@ -2324,7 +2324,7 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
|
||||
|
||||
String ml;
|
||||
for (const StringName &E : sigs) {
|
||||
if (ml != String()) {
|
||||
if (!ml.is_empty()) {
|
||||
ml += ",";
|
||||
}
|
||||
ml += E;
|
||||
|
||||
Reference in New Issue
Block a user