From 8b94ceca60560fd06f60359492c47684eda57e5c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 18 May 2014 16:59:40 +0300
Subject: Move keysortfunctor into separate file.
---
src/input/inputmanager.cpp | 14 ++++----------
src/input/keysortfunctor.h | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 10 deletions(-)
create mode 100644 src/input/keysortfunctor.h
(limited to 'src/input')
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
--
cgit v1.2.3-70-g09d2