Browse Source

Fix NOLINT line for readability-convert-member-functions-to-static

Reverts: acd74cc0e3
pull/2246/head
Anders Jenbo 5 years ago
parent
commit
a17d96129f
  1. 3
      Source/controls/devices/joystick.cpp
  2. 3
      Source/controls/devices/joystick.h

3
Source/controls/devices/joystick.cpp

@ -178,7 +178,8 @@ int Joystick::ToSdlJoyButton(ControllerButton button)
}
}
bool Joystick::IsHatButtonPressed(ControllerButton button)
// NOLINTNEXTLINE(readability-convert-member-functions-to-static): Not static if joystick mappings are defined.
bool Joystick::IsHatButtonPressed(ControllerButton button) const
{
switch (button) {
#if defined(JOY_HAT_DPAD_UP_HAT) && defined(JOY_HAT_DPAD_UP)

3
Source/controls/devices/joystick.h

@ -37,8 +37,7 @@ public:
private:
static int ToSdlJoyButton(ControllerButton button);
// NOLINTNEXTLINE(readability-convert-member-functions-to-static): Not static if joystick mappings are defined.
static bool IsHatButtonPressed(ControllerButton button);
bool IsHatButtonPressed(ControllerButton button) const;
SDL_Joystick *sdl_joystick_ = NULL;
SDL_JoystickID instance_id_ = -1;

Loading…
Cancel
Save