diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /core/helper | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'core/helper')
-rw-r--r-- | core/helper/math_fieldwise.cpp | 15 | ||||
-rw-r--r-- | core/helper/math_fieldwise.h | 2 | ||||
-rw-r--r-- | core/helper/value_evaluator.h | 3 |
3 files changed, 13 insertions, 7 deletions
diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 1ea754b70f..377a3f8234 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -31,12 +31,17 @@ #include "core/helper/math_fieldwise.h" -#define SETUP_TYPE(m_type) m_type source=p_source; m_type target=p_target; -#define TRY_TRANSFER_FIELD(m_name,m_member) if (p_field==m_name) { target.m_member=source.m_member; } +#define SETUP_TYPE(m_type) \ + m_type source = p_source; \ + m_type target = p_target; +#define TRY_TRANSFER_FIELD(m_name, m_member) \ + if (p_field == m_name) { \ + target.m_member = source.m_member; \ + } -Variant fieldwise_assign(const Variant& p_target, const Variant& p_source, const String& p_field) { +Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field) { - ERR_FAIL_COND_V(p_target.get_type()!=p_source.get_type(),p_target); + ERR_FAIL_COND_V(p_target.get_type() != p_source.get_type(), p_target); switch (p_source.get_type()) { @@ -169,7 +174,7 @@ Variant fieldwise_assign(const Variant& p_target, const Variant& p_source, const ERR_FAIL_V(p_target); } - /* clang-format on */ + /* clang-format on */ } } diff --git a/core/helper/math_fieldwise.h b/core/helper/math_fieldwise.h index 31f9af8d0b..e73227f148 100644 --- a/core/helper/math_fieldwise.h +++ b/core/helper/math_fieldwise.h @@ -33,7 +33,7 @@ #include "core/variant.h" -Variant fieldwise_assign(const Variant& p_target, const Variant& p_source, const String& p_field); +Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field); #endif // TOOLS_ENABLED diff --git a/core/helper/value_evaluator.h b/core/helper/value_evaluator.h index 9ea03db4c6..e001e1646a 100644 --- a/core/helper/value_evaluator.h +++ b/core/helper/value_evaluator.h @@ -34,8 +34,9 @@ class ValueEvaluator : public Object { GDCLASS(ValueEvaluator, Object); + public: - virtual double eval(const String& p_text) { + virtual double eval(const String &p_text) { return p_text.to_double(); } }; |