diff options
| author | Anton Yabchinskiy | 2015-07-29 23:01:36 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-07-29 23:01:36 +0300 |
| commit | dc8df8a91a995796f0f330bf6bb6b209f6dfce08 (patch) | |
| tree | 46cfe09124703b07860754d6b44e0289422e0573 /scene/gui/button_array.cpp | |
| parent | 16746f157f83d666079ba3266acec13d35b84c3f (diff) | |
| parent | 922356b903061cda7591090bf19e8346c3a78cf5 (diff) | |
| download | godot-dc8df8a91a995796f0f330bf6bb6b209f6dfce08.tar.gz godot-dc8df8a91a995796f0f330bf6bb6b209f6dfce08.tar.zst godot-dc8df8a91a995796f0f330bf6bb6b209f6dfce08.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'scene/gui/button_array.cpp')
| -rw-r--r-- | scene/gui/button_array.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/gui/button_array.cpp b/scene/gui/button_array.cpp index e3a2b7b29..b86e32dda 100644 --- a/scene/gui/button_array.cpp +++ b/scene/gui/button_array.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -34,7 +34,7 @@ bool ButtonArray::_set(const StringName& p_name, const Variant& p_value) { String n=String(p_name); if (n.begins_with("button/")) { - String what = n.get_slice("/",1); + String what = n.get_slicec('/',1); if (what=="count") { int new_size=p_value; if (new_size>0 && buttons.size()==0) { @@ -57,7 +57,7 @@ bool ButtonArray::_set(const StringName& p_name, const Variant& p_value) { } else { int idx=what.to_int(); ERR_FAIL_INDEX_V(idx,buttons.size(),false); - String f = n.get_slice("/",2); + String f = n.get_slicec('/',2); if (f=="text") buttons[idx].text=p_value; else if (f=="icon") @@ -80,7 +80,7 @@ bool ButtonArray::_get(const StringName& p_name,Variant &r_ret) const { String n=String(p_name); if (n.begins_with("button/")) { - String what = n.get_slice("/",1); + String what = n.get_slicec('/',1); if (what=="count") { r_ret=buttons.size(); } else if (what=="align") { @@ -92,7 +92,7 @@ bool ButtonArray::_get(const StringName& p_name,Variant &r_ret) const { } else { int idx=what.to_int(); ERR_FAIL_INDEX_V(idx,buttons.size(),false); - String f = n.get_slice("/",2); + String f = n.get_slicec('/',2); if (f=="text") r_ret=buttons[idx].text; else if (f=="icon") |