From 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 13:23:58 +0200 Subject: Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks Which means that reduz' beloved style which we all became used to will now be changed automatically to remove the first empty line. This makes us lean closer to 1TBS (the one true brace style) instead of hybridating it with some Allman-inspired spacing. There's still the case of braces around single-statement blocks that needs to be addressed (but clang-format can't help with that, but clang-tidy may if we agree about it). Part of #33027. --- core/callable_method_pointer.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'core/callable_method_pointer.h') diff --git a/core/callable_method_pointer.h b/core/callable_method_pointer.h index fb809c2b44..3b0503e259 100644 --- a/core/callable_method_pointer.h +++ b/core/callable_method_pointer.h @@ -38,7 +38,6 @@ #include "core/simple_type.h" class CallableCustomMethodPointerBase : public CallableCustom { - uint32_t *comp_ptr; uint32_t comp_size; uint32_t h; @@ -74,7 +73,6 @@ public: template struct VariantCasterAndValidate { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -89,7 +87,6 @@ struct VariantCasterAndValidate { template struct VariantCasterAndValidate { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -104,7 +101,6 @@ struct VariantCasterAndValidate { template struct VariantCasterAndValidate { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, Callable::CallError &r_error) { Variant::Type argtype = GetTypeInfo::VARIANT_TYPE; if (!Variant::can_convert_strict(p_args[p_arg_idx]->get_type(), argtype)) { @@ -163,7 +159,6 @@ void call_with_variant_args(T *p_instance, void (T::*p_method)(P...), const Vari template class CallableCustomMethodPointer : public CallableCustomMethodPointerBase { - struct Data { T *instance; void (T::*method)(P...); @@ -173,7 +168,6 @@ public: virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { - call_with_variant_args(data.instance, data.method, p_arguments, p_argcount, r_call_error); } @@ -246,7 +240,6 @@ void call_with_variant_args_ret(T *p_instance, R (T::*p_method)(P...), const Var template class CallableCustomMethodPointerRet : public CallableCustomMethodPointerBase { - struct Data { T *instance; R(T::*method) @@ -257,7 +250,6 @@ public: virtual ObjectID get_object() const { return data.instance->get_instance_id(); } virtual void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const { - call_with_variant_args_ret(data.instance, data.method, p_arguments, p_argcount, r_return_value, r_call_error); } -- cgit v1.2.3