diff --git a/include/SFML/Window/Joystick.hpp b/include/SFML/Window/Joystick.hpp index dd5005b862..e5bc8b8735 100644 --- a/include/SFML/Window/Joystick.hpp +++ b/include/SFML/Window/Joystick.hpp @@ -42,9 +42,9 @@ namespace sf::Joystick /// //////////////////////////////////////////////////////////// // NOLINTBEGIN(readability-identifier-naming) -static constexpr unsigned int Count{8}; //!< Maximum number of supported joysticks -static constexpr unsigned int ButtonCount{32}; //!< Maximum number of supported buttons -static constexpr unsigned int AxisCount{8}; //!< Maximum number of supported axes +constexpr unsigned int Count{8}; //!< Maximum number of supported joysticks +constexpr unsigned int ButtonCount{32}; //!< Maximum number of supported buttons +constexpr unsigned int AxisCount{8}; //!< Maximum number of supported axes // NOLINTEND(readability-identifier-naming) //////////////////////////////////////////////////////////// diff --git a/include/SFML/Window/Keyboard.hpp b/include/SFML/Window/Keyboard.hpp index 6b625ce50b..d0b45a8c3c 100644 --- a/include/SFML/Window/Keyboard.hpp +++ b/include/SFML/Window/Keyboard.hpp @@ -159,7 +159,7 @@ enum class Key /// //////////////////////////////////////////////////////////// // NOLINTNEXTLINE(readability-identifier-naming) -static constexpr unsigned int KeyCount{static_cast(Key::Pause) + 1}; +constexpr unsigned int KeyCount{static_cast(Key::Pause) + 1}; //////////////////////////////////////////////////////////// /// \brief Scancodes @@ -333,7 +333,7 @@ using Scancode = Scan; /// //////////////////////////////////////////////////////////// // NOLINTNEXTLINE(readability-identifier-naming) -static constexpr unsigned int ScancodeCount{static_cast(Scan::LaunchMediaSelect) + 1}; +constexpr unsigned int ScancodeCount{static_cast(Scan::LaunchMediaSelect) + 1}; //////////////////////////////////////////////////////////// /// \brief Check if a key is pressed diff --git a/include/SFML/Window/Mouse.hpp b/include/SFML/Window/Mouse.hpp index 528c420b53..2242fb2c77 100644 --- a/include/SFML/Window/Mouse.hpp +++ b/include/SFML/Window/Mouse.hpp @@ -56,7 +56,7 @@ enum class Button }; // NOLINTNEXTLINE(readability-identifier-naming) -static constexpr unsigned int ButtonCount{5}; //!< The total number of mouse buttons +constexpr unsigned int ButtonCount{5}; //!< The total number of mouse buttons //////////////////////////////////////////////////////////// /// \brief Mouse wheels diff --git a/include/SFML/Window/Sensor.hpp b/include/SFML/Window/Sensor.hpp index 1496131795..fd23125e0a 100644 --- a/include/SFML/Window/Sensor.hpp +++ b/include/SFML/Window/Sensor.hpp @@ -52,7 +52,7 @@ enum class Type }; // NOLINTNEXTLINE(readability-identifier-naming) -static constexpr unsigned int Count{6}; //!< The total number of sensor types +constexpr unsigned int Count{6}; //!< The total number of sensor types //////////////////////////////////////////////////////////// /// \brief Check if a sensor is available on the underlying platform