diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-27 14:16:32 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-27 14:16:32 +0200 |
| commit | c90bfcb1c6bd0640cb6a7effc0fadc03462e937e (patch) | |
| tree | a4fb1c3f273fbdcd7056495af94ad4b1c1d46901 | |
| parent | 21e53c42672e46c74bce6246fde16f4200c48163 (diff) | |
Re-apply clang-format to all files
Some badly formatted code has managed to pass through our CI...
| -rw-r--r-- | core/class_db.cpp | 7 | ||||
| -rw-r--r-- | core/class_db.h | 3 | ||||
| -rw-r--r-- | platform/uwp/joypad_uwp.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/class_db.cpp b/core/class_db.cpp index cd55219b53..4d92c5b6dd 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -600,9 +600,9 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName #ifdef DEBUG_METHODS_ENABLED String enum_name = p_enum; - if (enum_name!=String()) { - if (enum_name.find(".")!=-1) { - enum_name=enum_name.get_slicec('.',1); + if (enum_name != String()) { + if (enum_name.find(".") != -1) { + enum_name = enum_name.get_slicec('.', 1); } List<StringName> *constants_list = type->enum_map.getptr(enum_name); @@ -614,7 +614,6 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName new_list.push_back(p_name); type->enum_map[enum_name] = new_list; } - } type->constant_order.push_back(p_name); diff --git a/core/class_db.h b/core/class_db.h index 0943cd36cc..f28710361d 100644 --- a/core/class_db.h +++ b/core/class_db.h @@ -457,7 +457,8 @@ public: } type->method_map[p_name] = bind; #ifdef DEBUG_METHODS_ENABLED -// bind->set_return_type("Variant"); + // FIXME: <reduz> set_return_type is no longer in MethodBind, so I guess it should be moved to vararg method bind + //bind->set_return_type("Variant"); type->method_order.push_back(p_name); #endif diff --git a/platform/uwp/joypad_uwp.cpp b/platform/uwp/joypad_uwp.cpp index f3d4eb99c8..1c1dc308b9 100644 --- a/platform/uwp/joypad_uwp.cpp +++ b/platform/uwp/joypad_uwp.cpp @@ -54,7 +54,7 @@ void JoypadUWP::process_controllers() { case ControllerType::GAMEPAD_CONTROLLER: { - GamepadReading reading = ((Gamepad ^) joy.controller_reference)->GetCurrentReading(); + GamepadReading reading = ((Gamepad ^)joy.controller_reference)->GetCurrentReading(); int button_mask = (int)GamepadButtons::Menu; for (int j = 0; j < 14; j++) { @@ -161,7 +161,7 @@ void JoypadUWP::joypad_vibration_start(int p_device, float p_weak_magnitude, flo GamepadVibration vibration; vibration.LeftMotor = p_strong_magnitude; vibration.RightMotor = p_weak_magnitude; - ((Gamepad ^) joy.controller_reference)->Vibration = vibration; + ((Gamepad ^)joy.controller_reference)->Vibration = vibration; joy.ff_timestamp = p_timestamp; joy.ff_end_timestamp = p_duration == 0 ? 0 : p_timestamp + (uint64_t)(p_duration * 1000000.0); @@ -175,7 +175,7 @@ void JoypadUWP::joypad_vibration_stop(int p_device, uint64_t p_timestamp) { GamepadVibration vibration; vibration.LeftMotor = 0.0; vibration.RightMotor = 0.0; - ((Gamepad ^) joy.controller_reference)->Vibration = vibration; + ((Gamepad ^)joy.controller_reference)->Vibration = vibration; joy.ff_timestamp = p_timestamp; joy.vibrating = false; |