From 6da8da79a861a98ff7ad49da2d4069b3b1c1a158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 May 2016 12:51:03 +0200 Subject: [PATCH] Platform: properly prefix private member variables. --- src/Magnum/Platform/Sdl2Application.cpp | 8 ++++---- src/Magnum/Platform/Sdl2Application.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp index aeb6b981c..60486cbf2 100644 --- a/src/Magnum/Platform/Sdl2Application.cpp +++ b/src/Magnum/Platform/Sdl2Application.cpp @@ -500,14 +500,14 @@ Sdl2Application::Configuration::Configuration(): Sdl2Application::Configuration::~Configuration() = default; Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseEvent::modifiers() { - if(modifiersLoaded) return _modifiers; - modifiersLoaded = true; + if(_modifiersLoaded) return _modifiers; + _modifiersLoaded = true; return _modifiers = fixedModifiers(Uint16(SDL_GetModState())); } Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseMoveEvent::modifiers() { - if(modifiersLoaded) return _modifiers; - modifiersLoaded = true; + if(_modifiersLoaded) return _modifiers; + _modifiersLoaded = true; return _modifiers = fixedModifiers(Uint16(SDL_GetModState())); } diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 7c3c34277..7878376d6 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -1143,11 +1143,11 @@ class Sdl2Application::MouseEvent: public Sdl2Application::InputEvent { Modifiers modifiers(); private: - constexpr MouseEvent(Button button, const Vector2i& position): _button(button), _position(position), modifiersLoaded(false) {} + constexpr MouseEvent(Button button, const Vector2i& position): _button{button}, _position{position}, _modifiersLoaded{false} {} const Button _button; const Vector2i _position; - bool modifiersLoaded; + bool _modifiersLoaded; Modifiers _modifiers; }; @@ -1201,11 +1201,11 @@ class Sdl2Application::MouseMoveEvent: public Sdl2Application::InputEvent { Modifiers modifiers(); private: - constexpr MouseMoveEvent(const Vector2i& position, const Vector2i& relativePosition, Buttons buttons): _position(position), _relativePosition(relativePosition), modifiersLoaded(false), _buttons(buttons) {} + constexpr MouseMoveEvent(const Vector2i& position, const Vector2i& relativePosition, Buttons buttons): _position{position}, _relativePosition{relativePosition}, _buttons{buttons}, _modifiersLoaded{false} {} const Vector2i _position, _relativePosition; - bool modifiersLoaded; - Buttons _buttons; + const Buttons _buttons; + bool _modifiersLoaded; Modifiers _modifiers; };