From 798d6667e77c6fb5d9b99990a0bae03b50cebd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 1 Nov 2013 13:41:48 +0100 Subject: [PATCH] Platform: deinline default event handlers. They can't be used as inline anyway. --- src/Platform/AbstractXApplication.cpp | 6 ++++++ src/Platform/AbstractXApplication.h | 7 ------- src/Platform/GlutApplication.cpp | 5 +++++ src/Platform/GlutApplication.h | 6 ------ src/Platform/NaClApplication.cpp | 6 ++++++ src/Platform/NaClApplication.h | 7 ------- src/Platform/Sdl2Application.cpp | 6 ++++++ src/Platform/Sdl2Application.h | 7 ------- 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/Platform/AbstractXApplication.cpp b/src/Platform/AbstractXApplication.cpp index 0b4e99f31..84bbf4e6c 100644 --- a/src/Platform/AbstractXApplication.cpp +++ b/src/Platform/AbstractXApplication.cpp @@ -168,6 +168,12 @@ int AbstractXApplication::exec() { 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() = default; diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h index 795491f97..4c440be35 100644 --- a/src/Platform/AbstractXApplication.h +++ b/src/Platform/AbstractXApplication.h @@ -481,13 +481,6 @@ class AbstractXApplication::MouseMoveEvent: public AbstractXApplication::InputEv 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 diff --git a/src/Platform/GlutApplication.cpp b/src/Platform/GlutApplication.cpp index 5598612f7..7421467b6 100644 --- a/src/Platform/GlutApplication.cpp +++ b/src/Platform/GlutApplication.cpp @@ -108,6 +108,11 @@ void GlutApplication::staticMouseMoveEvent(int x, int y) { 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() = default; diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h index 54da441e1..7d63bd477 100644 --- a/src/Platform/GlutApplication.h +++ b/src/Platform/GlutApplication.h @@ -542,12 +542,6 @@ typedef GlutApplication Application; 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 diff --git a/src/Platform/NaClApplication.cpp b/src/Platform/NaClApplication.cpp index c3a56a45e..f1f84ad6e 100644 --- a/src/Platform/NaClApplication.cpp +++ b/src/Platform/NaClApplication.cpp @@ -248,4 +248,10 @@ void NaClApplication::mouseLockCallback(void* applicationInstance, std::int32_t) instance->flags |= Flag::MouseLocked; } +void NaClApplication::keyPressEvent(KeyEvent&) {} +void NaClApplication::keyReleaseEvent(KeyEvent&) {} +void NaClApplication::mousePressEvent(MouseEvent&) {} +void NaClApplication::mouseReleaseEvent(MouseEvent&) {} +void NaClApplication::mouseMoveEvent(MouseMoveEvent&) {} + }} diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h index 104e16e2c..cbe7766f9 100644 --- a/src/Platform/NaClApplication.h +++ b/src/Platform/NaClApplication.h @@ -666,13 +666,6 @@ typedef NaClApplication Application; CORRADE_ENUMSET_OPERATORS(NaClApplication::InputEvent::Modifiers) 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 diff --git a/src/Platform/Sdl2Application.cpp b/src/Platform/Sdl2Application.cpp index cb2e71224..ccdfc4301 100644 --- a/src/Platform/Sdl2Application.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -241,6 +241,12 @@ void Sdl2Application::setMouseLocked(bool enabled) { #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() = default; diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index a0451e282..263d9efdb 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -653,13 +653,6 @@ typedef Sdl2Application Application; CORRADE_ENUMSET_OPERATORS(Sdl2Application::InputEvent::Modifiers) 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