diff options
| author | hurikhan | 2015-02-15 17:49:34 +0800 |
|---|---|---|
| committer | hurikhan | 2015-02-15 17:49:34 +0800 |
| commit | ee81d4b359ec5dbeaed5725739ba53b7734372cd (patch) | |
| tree | 50bff1e6e336fe66d0f58c00841403ce091d3f1c /core/variant.h | |
| parent | a13e180052d2e17275498a2fa78185cc299ace11 (diff) | |
| parent | 2185c018f6593e6d64b2beb62202d2291e2e008e (diff) | |
| download | godot-ee81d4b359ec5dbeaed5725739ba53b7734372cd.tar.gz godot-ee81d4b359ec5dbeaed5725739ba53b7734372cd.tar.zst godot-ee81d4b359ec5dbeaed5725739ba53b7734372cd.zip | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Diffstat (limited to 'core/variant.h')
| -rw-r--r-- | core/variant.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/variant.h b/core/variant.h index 47fc3f43a..d5d479242 100644 --- a/core/variant.h +++ b/core/variant.h @@ -419,7 +419,11 @@ public: static bool has_numeric_constant(Variant::Type p_type, const StringName& p_value); static int get_numeric_constant_value(Variant::Type p_type, const StringName& p_value); - String get_construct_string() const; + typedef String (*ObjectDeConstruct)(const Variant& p_object,void *ud); + typedef void (*ObjectConstruct)(const String& p_text,void *ud,Variant& r_value); + + String get_construct_string(ObjectDeConstruct p_obj_deconstruct=NULL,void *p_deconstruct_ud=NULL) const; + static void construct_from_string(const String& p_string,Variant& r_value,ObjectConstruct p_obj_construct=NULL,void *p_construct_ud=NULL); void operator=(const Variant& p_variant); // only this is enough for all the other types Variant(const Variant& p_variant); |