Move keysortfunctor into separate file.

4 files changed, 45 insertions, 10 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3d4c3cbd7..2fc02e2f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -761,6 +761,7 @@ SET(SRCS
     input/keyboarddata.h
     input/keydata.h
     input/keyinput.h
+    input/keysortfunctor.h
     input/multitouchmanager.cpp
     input/multitouchmanager.h
     localconsts.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d561cb987..bd02cd8b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -865,6 +865,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      input/keyboarddata.h \
 	      input/keydata.h \
 	      input/keyinput.h \
+	      input/keysortfunctor.h \
 	      input/multitouchmanager.cpp \
 	      input/multitouchmanager.h \
 	      localconsts.h \
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),
diff --git a/src/input/keysortfunctor.h b/src/input/keysortfunctor.h
new file mode 100644
index 000000000..fae1bedda
--- /dev/null
+++ b/src/input/keysortfunctor.h
@@ -0,0 +1,39 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUT_KEYSORTFUNCTOR_H
+#define INPUT_KEYSORTFUNCTOR_H
+
+#include "input/keydata.h"
+
+#include "localconsts.h"
+
+class KeySortFunctor final
+{
+    public:
+        bool operator() (const int key1, const int key2) const
+        {
+            return keys[key1].priority >= keys[key2].priority;
+        }
+
+        const KeyData *keys;
+};
+
+#endif  // INPUT_KEYSORTFUNCTOR_H