summaryrefslogtreecommitdiff
path: root/src/input/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-18 16:59:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-18 16:59:40 +0300
commit8b94ceca60560fd06f60359492c47684eda57e5c (patch)
treede92ac00a989f124133a470c7f2542fcfd76ac8e /src/input/inputmanager.cpp
parent4c5c512dcc2a561172a09cc9962ab6f597c9058c (diff)
downloadmv-8b94ceca60560fd06f60359492c47684eda57e5c.tar.gz
mv-8b94ceca60560fd06f60359492c47684eda57e5c.tar.bz2
mv-8b94ceca60560fd06f60359492c47684eda57e5c.tar.xz
mv-8b94ceca60560fd06f60359492c47684eda57e5c.zip
Move keysortfunctor into separate file.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r--src/input/inputmanager.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index c30d97394..d3f38c7c1 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -27,6 +27,7 @@
#include "input/joystick.h"
#include "input/keyboardconfig.h"
#include "input/keyboarddata.h"
+#include "input/keysortfunctor.h"
#include "being/localplayer.h"
#ifdef USE_SDL2
#include "input/multitouchmanager.h"
@@ -61,17 +62,10 @@ class QuitDialog;
extern QuitDialog *quitDialog;
-static class KeyFunctor final
+namespace
{
- public:
- bool operator() (const int key1, const int key2) const
- {
- return keys[key1].priority >= keys[key2].priority;
- }
-
- const KeyData *keys;
-} keyDataSorter;
-
+ KeySortFunctor keyDataSorter;
+} // namespace
InputManager::InputManager() :
mSetupInput(nullptr),