diff options
| author | Carl Olsson <carl.olsson@gmail.com> | 2015-02-11 21:15:49 +1000 |
|---|---|---|
| committer | Carl Olsson <carl.olsson@gmail.com> | 2015-02-11 21:15:49 +1000 |
| commit | 573ae5dd926df0dbd63b787945ace0fa76f08976 (patch) | |
| tree | ca21f025cab021fdb43d6a7b77222c4bcf62f63a /core/ustring.h | |
| parent | 9171f71ff55def0f661a3d76e4ebcfc945092ad3 (diff) | |
| parent | 78a268c2eb3099103164407761e06afa0c6339d4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/polygon_path_finder_demo/.fscache
Diffstat (limited to 'core/ustring.h')
| -rw-r--r-- | core/ustring.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/ustring.h b/core/ustring.h index e1d6761742..af5ffb7c35 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -31,6 +31,7 @@ #include "typedefs.h" #include "vector.h" +#include "array.h" /** @author red <red@killy> @@ -127,10 +128,13 @@ public: String insert(int p_at_pos,String p_string) const; String pad_decimals(int p_digits) const; String pad_zeros(int p_digits) const; + String lpad(int min_length,const String& character=" ") const; + String rpad(int min_length,const String& character=" ") const; + String sprintf(const Array& values) const; static String num(double p_num,int p_decimals=-1); static String num_scientific(double p_num); static String num_real(double p_num); - static String num_int64(int64_t p_num); + static String num_int64(int64_t p_num,int base=10,bool capitalize_hex=false); static String chr(CharType p_char); static String md5(const uint8_t *p_md5); bool is_numeric() const; @@ -203,7 +207,7 @@ public: String xml_unescape() const; String c_escape() const; String c_unescape() const; - + String percent_encode() const; String percent_decode() const; |