Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Style: Re-apply clang-format over recent invalid additions

Browse source
This commit is contained in:
Rémi Verschelde 2017-12-10 01:27:02 +01:00
parent 7cb6e6b723
commit a845411454
12 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/io/json.cpp
View file

@ -43,7 +43,7 @@ const char *JSON::tk_name[TK_MAX] = {
"EOF",
};
static String _make_indent(const String& p_indent, int p_size) {
static String _make_indent(const String &p_indent, int p_size) {
String indent_text = "";
if (!p_indent.empty()) {
@ -53,7 +53,7 @@ static String _make_indent(const String& p_indent, int p_size) {
return indent_text;
}
String JSON::_print_var(const Variant &p_var, const String& p_indent, int p_cur_indent, bool p_sort_keys) {
String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys) {
String colon = ":";
String end_statement = "";
@ -116,7 +116,7 @@ String JSON::_print_var(const Variant &p_var, const String& p_indent, int p_cur_
}
}
String JSON::print(const Variant &p_var, const String& p_indent, bool p_sort_keys) {
String JSON::print(const Variant &p_var, const String &p_indent, bool p_sort_keys) {
return _print_var(p_var, p_indent, 0, p_sort_keys);
}

4
core/io/json.h
View file

@ -64,7 +64,7 @@ class JSON {
static const char *tk_name[TK_MAX];
static String _print_var(const Variant &p_var, const String& p_indent, int p_cur_indent, bool p_sort_keys);
static String _print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys);
static Error _get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str);
static Error _parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str);
@ -72,7 +72,7 @@ class JSON {
static Error _parse_object(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str);
public:
static String print(const Variant &p_var, const String& p_indent = "", bool p_sort_keys = true);
static String print(const Variant &p_var, const String &p_indent = "", bool p_sort_keys = true);
static Error parse(const String &p_json, Variant &r_ret, String &r_err_str, int &r_err_line);
};