summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-05 21:49:04 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-06 12:12:22 +0300
commit2bd59adc7c456ce6f377feac8bc838e8011ebfc8 (patch)
treef2f25428e42e59b9a6d55d7c0be9a99c42e96e40 /src/input
parentac1ef6b19f5c1405cfaa239ab367a93b17043723 (diff)
downloadmanaplus-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.gz
manaplus-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.bz2
manaplus-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.xz
manaplus-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.zip
Fix code style.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactiondata.h2
-rw-r--r--src/input/inputmanager.h8
-rw-r--r--src/input/pages/basic.cpp2
-rw-r--r--src/input/pages/chat.cpp2
-rw-r--r--src/input/pages/emotes.cpp2
-rw-r--r--src/input/pages/gui.cpp2
-rw-r--r--src/input/pages/move.cpp2
-rw-r--r--src/input/pages/other.cpp2
-rw-r--r--src/input/pages/outfits.cpp2
-rw-r--r--src/input/pages/shortcuts.cpp2
-rw-r--r--src/input/pages/windows.cpp2
11 files changed, 4 insertions, 24 deletions
diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h
index f25a5a7f7..ae9359466 100644
--- a/src/input/inputactiondata.h
+++ b/src/input/inputactiondata.h
@@ -25,8 +25,6 @@
#include "actions/actionfuncptr.h"
-#include "enums/input/inputaction.h"
-
#include "enums/simpletypes/useargs.h"
struct InputActionData final
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 79a197799..c9d71a091 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -21,8 +21,6 @@
#ifndef INPUT_INPUTMANAGER_H
#define INPUT_INPUTMANAGER_H
-#include "enums/input/inputaction.h"
-
#include "input/inputfunction.h"
#include "events/inputevent.h"
@@ -68,9 +66,11 @@ class InputManager final
InputFunction &getKey(InputActionT index) A_WARN_UNUSED;
- std::string getKeyValueString(const InputActionT index) const A_WARN_UNUSED;
+ std::string getKeyValueString(const InputActionT index)
+ const A_WARN_UNUSED;
- std::string getKeyStringLong(const InputActionT index) const A_WARN_UNUSED;
+ std::string getKeyStringLong(const InputActionT index)
+ const A_WARN_UNUSED;
std::string getKeyValueByName(const std::string &keyName);
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index bb8c8b5c2..c87ac56d9 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp
index 33ba3929c..c2e89a94b 100644
--- a/src/input/pages/chat.cpp
+++ b/src/input/pages/chat.cpp
@@ -20,8 +20,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/input/pages/emotes.cpp b/src/input/pages/emotes.cpp
index ddb80e7b9..ff638a752 100644
--- a/src/input/pages/emotes.cpp
+++ b/src/input/pages/emotes.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/input/pages/gui.cpp b/src/input/pages/gui.cpp
index da9ce4f91..4b799ac30 100644
--- a/src/input/pages/gui.cpp
+++ b/src/input/pages/gui.cpp
@@ -20,8 +20,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp
index 2156b9d27..c32a56330 100644
--- a/src/input/pages/move.cpp
+++ b/src/input/pages/move.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp
index 433907347..b3d57d4c8 100644
--- a/src/input/pages/other.cpp
+++ b/src/input/pages/other.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp
index 708587cbe..c3c4ff2a5 100644
--- a/src/input/pages/outfits.cpp
+++ b/src/input/pages/outfits.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/input/pages/shortcuts.cpp b/src/input/pages/shortcuts.cpp
index 075532ced..f72b2a116 100644
--- a/src/input/pages/shortcuts.cpp
+++ b/src/input/pages/shortcuts.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "utils/stringutils.h"
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
index 49efc9794..00e96a968 100644
--- a/src/input/pages/windows.cpp
+++ b/src/input/pages/windows.cpp
@@ -23,8 +23,6 @@
#include "gui/setupactiondata.h"
-#include "enums/input/inputaction.h"
-
#include "utils/gettext.h"
#include "debug.h"