Browse Source

Platform: deinline default event handlers.

They can't be used as inline anyway.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
798d6667e7
  1. 6
      src/Platform/AbstractXApplication.cpp
  2. 7
      src/Platform/AbstractXApplication.h
  3. 5
      src/Platform/GlutApplication.cpp
  4. 6
      src/Platform/GlutApplication.h
  5. 6
      src/Platform/NaClApplication.cpp
  6. 7
      src/Platform/NaClApplication.h
  7. 6
      src/Platform/Sdl2Application.cpp
  8. 7
      src/Platform/Sdl2Application.h

6
src/Platform/AbstractXApplication.cpp

@ -168,6 +168,12 @@ int AbstractXApplication::exec() {
return 0; return 0;
} }
void AbstractXApplication::keyPressEvent(KeyEvent&) {}
void AbstractXApplication::keyReleaseEvent(KeyEvent&) {}
void AbstractXApplication::mousePressEvent(MouseEvent&) {}
void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {}
void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {}
AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600) {} AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600) {}
AbstractXApplication::Configuration::~Configuration() = default; AbstractXApplication::Configuration::~Configuration() = default;

7
src/Platform/AbstractXApplication.h

@ -481,13 +481,6 @@ class AbstractXApplication::MouseMoveEvent: public AbstractXApplication::InputEv
const Vector2i _position; const Vector2i _position;
}; };
/* Implementations for inline functions with unused parameters */
inline void AbstractXApplication::keyPressEvent(KeyEvent&) {}
inline void AbstractXApplication::keyReleaseEvent(KeyEvent&) {}
inline void AbstractXApplication::mousePressEvent(MouseEvent&) {}
inline void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {}
inline void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {}
}} }}
#endif #endif

5
src/Platform/GlutApplication.cpp

@ -108,6 +108,11 @@ void GlutApplication::staticMouseMoveEvent(int x, int y) {
instance->mouseMoveEvent(e); instance->mouseMoveEvent(e);
} }
void GlutApplication::keyPressEvent(KeyEvent&) {}
void GlutApplication::mousePressEvent(MouseEvent&) {}
void GlutApplication::mouseReleaseEvent(MouseEvent&) {}
void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {}
GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0) {} GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0) {}
GlutApplication::Configuration::~Configuration() = default; GlutApplication::Configuration::~Configuration() = default;

6
src/Platform/GlutApplication.h

@ -542,12 +542,6 @@ typedef GlutApplication Application;
CORRADE_ENUMSET_OPERATORS(GlutApplication::MouseMoveEvent::Buttons) CORRADE_ENUMSET_OPERATORS(GlutApplication::MouseMoveEvent::Buttons)
/* Implementations for inline functions with unused parameters */
inline void GlutApplication::keyPressEvent(KeyEvent&) {}
inline void GlutApplication::mousePressEvent(MouseEvent&) {}
inline void GlutApplication::mouseReleaseEvent(MouseEvent&) {}
inline void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {}
}} }}
#endif #endif

6
src/Platform/NaClApplication.cpp

@ -248,4 +248,10 @@ void NaClApplication::mouseLockCallback(void* applicationInstance, std::int32_t)
instance->flags |= Flag::MouseLocked; instance->flags |= Flag::MouseLocked;
} }
void NaClApplication::keyPressEvent(KeyEvent&) {}
void NaClApplication::keyReleaseEvent(KeyEvent&) {}
void NaClApplication::mousePressEvent(MouseEvent&) {}
void NaClApplication::mouseReleaseEvent(MouseEvent&) {}
void NaClApplication::mouseMoveEvent(MouseMoveEvent&) {}
}} }}

7
src/Platform/NaClApplication.h

@ -666,13 +666,6 @@ typedef NaClApplication Application;
CORRADE_ENUMSET_OPERATORS(NaClApplication::InputEvent::Modifiers) CORRADE_ENUMSET_OPERATORS(NaClApplication::InputEvent::Modifiers)
CORRADE_ENUMSET_OPERATORS(NaClApplication::InputEvent::Buttons) CORRADE_ENUMSET_OPERATORS(NaClApplication::InputEvent::Buttons)
/* Implementations for inline functions with unused parameters */
inline void NaClApplication::keyPressEvent(KeyEvent&) {}
inline void NaClApplication::keyReleaseEvent(KeyEvent&) {}
inline void NaClApplication::mousePressEvent(MouseEvent&) {}
inline void NaClApplication::mouseReleaseEvent(MouseEvent&) {}
inline void NaClApplication::mouseMoveEvent(MouseMoveEvent&) {}
}} }}
#endif #endif

6
src/Platform/Sdl2Application.cpp

@ -241,6 +241,12 @@ void Sdl2Application::setMouseLocked(bool enabled) {
#endif #endif
} }
void Sdl2Application::keyPressEvent(KeyEvent&) {}
void Sdl2Application::keyReleaseEvent(KeyEvent&) {}
void Sdl2Application::mousePressEvent(MouseEvent&) {}
void Sdl2Application::mouseReleaseEvent(MouseEvent&) {}
void Sdl2Application::mouseMoveEvent(MouseMoveEvent&) {}
Sdl2Application::Configuration::Configuration(): _title("Magnum SDL2 Application"), _size(800, 600), _flags(Flag::Resizable), _sampleCount(0) {} Sdl2Application::Configuration::Configuration(): _title("Magnum SDL2 Application"), _size(800, 600), _flags(Flag::Resizable), _sampleCount(0) {}
Sdl2Application::Configuration::~Configuration() = default; Sdl2Application::Configuration::~Configuration() = default;

7
src/Platform/Sdl2Application.h

@ -653,13 +653,6 @@ typedef Sdl2Application Application;
CORRADE_ENUMSET_OPERATORS(Sdl2Application::InputEvent::Modifiers) CORRADE_ENUMSET_OPERATORS(Sdl2Application::InputEvent::Modifiers)
CORRADE_ENUMSET_OPERATORS(Sdl2Application::MouseMoveEvent::Buttons) CORRADE_ENUMSET_OPERATORS(Sdl2Application::MouseMoveEvent::Buttons)
/* Implementations for inline functions with unused parameters */
inline void Sdl2Application::keyPressEvent(KeyEvent&) {}
inline void Sdl2Application::keyReleaseEvent(KeyEvent&) {}
inline void Sdl2Application::mousePressEvent(MouseEvent&) {}
inline void Sdl2Application::mouseReleaseEvent(MouseEvent&) {}
inline void Sdl2Application::mouseMoveEvent(MouseMoveEvent&) {}
}} }}
#endif #endif

Loading…
Cancel
Save