Browse Source

Platform: properly prefix private member variables.

pull/157/head
Vladimír Vondruš 10 years ago
parent
commit
6da8da79a8
  1. 8
      src/Magnum/Platform/Sdl2Application.cpp
  2. 10
      src/Magnum/Platform/Sdl2Application.h

8
src/Magnum/Platform/Sdl2Application.cpp

@ -500,14 +500,14 @@ Sdl2Application::Configuration::Configuration():
Sdl2Application::Configuration::~Configuration() = default; Sdl2Application::Configuration::~Configuration() = default;
Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseEvent::modifiers() { Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseEvent::modifiers() {
if(modifiersLoaded) return _modifiers; if(_modifiersLoaded) return _modifiers;
modifiersLoaded = true; _modifiersLoaded = true;
return _modifiers = fixedModifiers(Uint16(SDL_GetModState())); return _modifiers = fixedModifiers(Uint16(SDL_GetModState()));
} }
Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseMoveEvent::modifiers() { Sdl2Application::InputEvent::Modifiers Sdl2Application::MouseMoveEvent::modifiers() {
if(modifiersLoaded) return _modifiers; if(_modifiersLoaded) return _modifiers;
modifiersLoaded = true; _modifiersLoaded = true;
return _modifiers = fixedModifiers(Uint16(SDL_GetModState())); return _modifiers = fixedModifiers(Uint16(SDL_GetModState()));
} }

10
src/Magnum/Platform/Sdl2Application.h

@ -1143,11 +1143,11 @@ class Sdl2Application::MouseEvent: public Sdl2Application::InputEvent {
Modifiers modifiers(); Modifiers modifiers();
private: 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 Button _button;
const Vector2i _position; const Vector2i _position;
bool modifiersLoaded; bool _modifiersLoaded;
Modifiers _modifiers; Modifiers _modifiers;
}; };
@ -1201,11 +1201,11 @@ class Sdl2Application::MouseMoveEvent: public Sdl2Application::InputEvent {
Modifiers modifiers(); Modifiers modifiers();
private: 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; const Vector2i _position, _relativePosition;
bool modifiersLoaded; const Buttons _buttons;
Buttons _buttons; bool _modifiersLoaded;
Modifiers _modifiers; Modifiers _modifiers;
}; };

Loading…
Cancel
Save