Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make more types (Callable, Signal) conversion to String explicit.

Browse source
This commit is contained in:
Lukas Tenbrink 2025-06-10 23:55:35 +02:00
parent ca1e4785b2
commit d2f9d31270
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/string/translation_server.h
View file

@ -77,7 +77,7 @@ class TranslationServer : public Object {
(p_locale.variant == variant); (p_locale.variant == variant);
} }
operator String() const; explicit operator String() const;
Locale(const TranslationServer &p_server, const String &p_locale, bool p_add_defaults); Locale(const TranslationServer &p_server, const String &p_locale, bool p_add_defaults);
}; };

2
core/templates/hashfuncs.h
View file

@ -55,6 +55,7 @@
#include "core/templates/pair.h" #include "core/templates/pair.h"
#include "core/templates/rid.h" #include "core/templates/rid.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "core/variant/callable.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#include <intrin.h> // Needed for `__umulh` below. #include <intrin.h> // Needed for `__umulh` below.
@ -342,6 +343,7 @@ struct HashMapHasherDefault {
static _FORCE_INLINE_ uint32_t hash(const StringName &p_string_name) { return p_string_name.hash(); } static _FORCE_INLINE_ uint32_t hash(const StringName &p_string_name) { return p_string_name.hash(); }
static _FORCE_INLINE_ uint32_t hash(const NodePath &p_path) { return p_path.hash(); } static _FORCE_INLINE_ uint32_t hash(const NodePath &p_path) { return p_path.hash(); }
static _FORCE_INLINE_ uint32_t hash(const ObjectID &p_id) { return hash_one_uint64(p_id); } static _FORCE_INLINE_ uint32_t hash(const ObjectID &p_id) { return hash_one_uint64(p_id); }
static _FORCE_INLINE_ uint32_t hash(const Callable &p_callable) { return p_callable.hash(); }
static _FORCE_INLINE_ uint32_t hash(const uint64_t p_int) { return hash_one_uint64(p_int); } static _FORCE_INLINE_ uint32_t hash(const uint64_t p_int) { return hash_one_uint64(p_int); }
static _FORCE_INLINE_ uint32_t hash(const int64_t p_int) { return hash_one_uint64(uint64_t(p_int)); } static _FORCE_INLINE_ uint32_t hash(const int64_t p_int) { return hash_one_uint64(uint64_t(p_int)); }

4
core/variant/callable.h
View file

@ -123,7 +123,7 @@ public:
void operator=(const Callable &p_callable); void operator=(const Callable &p_callable);
operator String() const; explicit operator String() const;
static Callable create(const Variant &p_variant, const StringName &p_method); static Callable create(const Variant &p_variant, const StringName &p_method);
@ -190,7 +190,7 @@ public:
bool operator!=(const Signal &p_signal) const; bool operator!=(const Signal &p_signal) const;
bool operator<(const Signal &p_signal) const; bool operator<(const Signal &p_signal) const;
operator String() const; explicit operator String() const;
Error emit(const Variant **p_arguments, int p_argcount) const; Error emit(const Variant **p_arguments, int p_argcount) const;
Error connect(const Callable &p_callable, uint32_t p_flags = 0); Error connect(const Callable &p_callable, uint32_t p_flags = 0);

2
core/variant/method_ptrcall.h
View file

@ -131,7 +131,7 @@ struct PtrToArgStringConvertByReference {
// No EncodeT because direct pointer conversion not possible. // No EncodeT because direct pointer conversion not possible.
_FORCE_INLINE_ static void encode(const T &p_vec, void *p_ptr) { _FORCE_INLINE_ static void encode(const T &p_vec, void *p_ptr) {
String *arr = reinterpret_cast<String *>(p_ptr); String *arr = reinterpret_cast<String *>(p_ptr);
*arr = p_vec; *arr = String(p_vec);
} }
}; };

4
core/variant/variant.cpp
View file

@ -1725,11 +1725,11 @@ String Variant::stringify(int recursion_count) const {
} }
case CALLABLE: { case CALLABLE: {
const Callable &c = *reinterpret_cast<const Callable *>(_data._mem); const Callable &c = *reinterpret_cast<const Callable *>(_data._mem);
return c; return String(c);
} }
case SIGNAL: { case SIGNAL: {
const Signal &s = *reinterpret_cast<const Signal *>(_data._mem); const Signal &s = *reinterpret_cast<const Signal *>(_data._mem);
return s; return String(s);
} }
case RID: { case RID: {
const ::RID &s = *reinterpret_cast<const ::RID *>(_data._mem); const ::RID &s = *reinterpret_cast<const ::RID *>(_data._mem);