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

Change StringName.operator const void * to explicit operator bool.

Browse Source
This commit is contained in:
Lukas Tenbrink
2025-01-08 16:04:11 +01:00
parent 7b9c5122fa
commit e989d7bd89
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/string/string_name.h
View File

@@ -97,7 +97,7 @@ class StringName {
StringName(_Data *p_data) { _data = p_data; }
public:
operator const void *() const { return (_data && (_data->cname || !_data->name.is_empty())) ? (void *)1 : nullptr; }
explicit operator bool() const { return _data && (_data->cname || !_data->name.is_empty()); }
bool operator==(const String &p_name) const;
bool operator==(const char *p_name) const;

2
modules/gdscript/gdscript_editor.cpp
View File

@@ -872,7 +872,7 @@ static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_functio
static void _get_directory_contents(EditorFileSystemDirectory *p_dir, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_list, const StringName &p_required_type = StringName()) {
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
const bool requires_type = p_required_type;
const bool requires_type = !p_required_type.is_empty();
for (int i = 0; i < p_dir->get_file_count(); i++) {
if (requires_type && !ClassDB::is_parent_class(p_dir->get_file_type(i), p_required_type)) {