Explorar el Código

Merge pull request #101291 from Ivorforce/stringname-to-bool

Change `StringName.operator const void *` to `explicit operator bool`.
Thaddeus Crews hace 5 meses
padre
commit
af252823ac
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      core/string/string_name.h
  2. 1 1
      modules/gdscript/gdscript_editor.cpp

+ 1 - 1
core/string/string_name.h

@@ -97,7 +97,7 @@ class StringName {
 	StringName(_Data *p_data) { _data = p_data; }
 	StringName(_Data *p_data) { _data = p_data; }
 
 
 public:
 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 String &p_name) const;
 	bool operator==(const char *p_name) const;
 	bool operator==(const char *p_name) const;

+ 1 - 1
modules/gdscript/gdscript_editor.cpp

@@ -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()) {
 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 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++) {
 	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)) {
 		if (requires_type && !ClassDB::is_parent_class(p_dir->get_file_type(i), p_required_type)) {