summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-17 22:17:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-17 22:17:32 +0300
commitb55357c4bffafa629453abdfd6bb411d89ec5f25 (patch)
tree6fe805fb0f009e3a1756bbc3fc9a01cdaf50210f
parenta01c8632961792ba92a5c0bda8308d1260444b41 (diff)
downloadplus-b55357c4bffafa629453abdfd6bb411d89ec5f25.tar.gz
plus-b55357c4bffafa629453abdfd6bb411d89ec5f25.tar.bz2
plus-b55357c4bffafa629453abdfd6bb411d89ec5f25.tar.xz
plus-b55357c4bffafa629453abdfd6bb411d89ec5f25.zip
Rename KeySortFunctor into InputActionSortFunctor.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/input/inputactionsortfunctor.h (renamed from src/input/keysortfunctor.h)8
-rw-r--r--src/input/inputmanager.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f960eb857..e60344b09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -807,6 +807,7 @@ SET(SRCS
input/inputaction.h
input/inputactiondata.h
input/inputactionmap.h
+ input/inputactionsortfunctor.h
input/inputcondition.h
input/inputfunction.h
input/inputitem.h
@@ -819,7 +820,6 @@ SET(SRCS
input/keyboardconfig.cpp
input/keyboardconfig.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 fe7df4c46..39780b5bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -929,6 +929,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
input/inputaction.h \
input/inputactiondata.h \
input/inputactionmap.h \
+ input/inputactionsortfunctor.h \
input/inputcondition.h \
input/inputfunction.h \
input/inputitem.h \
@@ -940,7 +941,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
input/keyboardconfig.cpp \
input/keyboardconfig.h \
input/keyinput.h \
- input/keysortfunctor.h \
input/multitouchmanager.cpp \
input/multitouchmanager.h \
localconsts.h \
diff --git a/src/input/keysortfunctor.h b/src/input/inputactionsortfunctor.h
index fedb4c395..1e79cc27e 100644
--- a/src/input/keysortfunctor.h
+++ b/src/input/inputactionsortfunctor.h
@@ -18,14 +18,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INPUT_KEYSORTFUNCTOR_H
-#define INPUT_KEYSORTFUNCTOR_H
+#ifndef INPUT_INPUTACTIONSORTFUNCTOR_H
+#define INPUT_INPUTACTIONSORTFUNCTOR_H
#include "input/inputactiondata.h"
#include "localconsts.h"
-class KeySortFunctor final
+class InputActionSortFunctor final
{
public:
bool operator() (const int key1, const int key2) const
@@ -36,4 +36,4 @@ class KeySortFunctor final
const InputActionData *keys;
};
-#endif // INPUT_KEYSORTFUNCTOR_H
+#endif // INPUT_INPUTACTIONSORTFUNCTOR_H
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 429297cfd..68950f4cf 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -25,9 +25,9 @@
#include "touchmanager.h"
#include "input/inputactionmap.h"
+#include "input/inputactionsortfunctor.h"
#include "input/joystick.h"
#include "input/keyboardconfig.h"
-#include "input/keysortfunctor.h"
#include "being/localplayer.h"
#ifdef USE_SDL2
#include "input/multitouchmanager.h"
@@ -64,7 +64,7 @@ extern QuitDialog *quitDialog;
namespace
{
- KeySortFunctor inputActionDataSorter;
+ InputActionSortFunctor inputActionDataSorter;
} // namespace
InputManager::InputManager() :