summaryrefslogtreecommitdiff
path: root/src/events
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-31 00:19:18 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-31 00:19:18 +0300
commit694e07d193e7c5758a7d672b45668651b034003d (patch)
tree20a4aec8dee2b3b5475db9f3667e797fb43c603b /src/events
parentc9a84749b3b71d4df6cc3b9b488d60dc4a013a20 (diff)
downloadmv-694e07d193e7c5758a7d672b45668651b034003d.tar.gz
mv-694e07d193e7c5758a7d672b45668651b034003d.tar.bz2
mv-694e07d193e7c5758a7d672b45668651b034003d.tar.xz
mv-694e07d193e7c5758a7d672b45668651b034003d.zip
Convert InputAction enum into strong typed enum.
Diffstat (limited to 'src/events')
-rw-r--r--src/events/inputevent.h13
-rw-r--r--src/events/keyevent.h9
2 files changed, 14 insertions, 8 deletions
diff --git a/src/events/inputevent.h b/src/events/inputevent.h
index 129e4d716..2eb615bb0 100644
--- a/src/events/inputevent.h
+++ b/src/events/inputevent.h
@@ -21,6 +21,8 @@
#ifndef EVENTS_INPUTEVENT_H
#define EVENTS_INPUTEVENT_H
+#include "enums/input/inputaction.h"
+
#include <map>
#include <string>
#include <vector>
@@ -29,14 +31,14 @@
class ChatTab;
-typedef std::vector<int> KeysVector;
+typedef std::vector<InputActionT> KeysVector;
typedef KeysVector::iterator KeysVectorIter;
typedef KeysVector::const_iterator KeysVectorCIter;
typedef std::map<int, KeysVector> KeyToActionMap;
typedef KeyToActionMap::iterator KeyToActionMapIter;
-typedef std::map<int, int> KeyToIdMap;
+typedef std::map<int, InputActionT> KeyToIdMap;
typedef KeyToIdMap::iterator KeyToIdMapIter;
typedef std::map<int, int> KeyTimeMap;
@@ -44,7 +46,8 @@ typedef KeyTimeMap::iterator KeyTimeMapIter;
struct InputEvent final
{
- InputEvent(const int action0, const int mask0) :
+ InputEvent(const InputActionT action0,
+ const int mask0) :
args(),
tab(nullptr),
action(action0),
@@ -56,7 +59,7 @@ struct InputEvent final
const int mask0) :
args(args0),
tab(tab0),
- action(-1),
+ action(InputAction::NO_VALUE),
mask(mask0)
{ }
@@ -64,7 +67,7 @@ struct InputEvent final
const std::string args;
ChatTab *const tab;
- const int action;
+ const InputActionT action;
const int mask;
};
diff --git a/src/events/keyevent.h b/src/events/keyevent.h
index 9f0a54972..d7b5b71b0 100644
--- a/src/events/keyevent.h
+++ b/src/events/keyevent.h
@@ -65,6 +65,9 @@
#define EVENTS_KEYEVENT_H
#include "enums/events/keyeventtype.h"
+
+#include "enums/input/inputaction.h"
+
#include "events/inputguievent.h"
#include "input/key.h"
@@ -89,7 +92,7 @@ class KeyEvent: public InputGuiEvent
*/
KeyEvent(Widget *const source,
KeyEventTypeT type,
- const int actionId,
+ const InputActionT actionId,
const Key &key) :
InputGuiEvent(source),
mKey(key),
@@ -122,7 +125,7 @@ class KeyEvent: public InputGuiEvent
const Key &getKey() const A_WARN_UNUSED
{ return mKey; }
- int getActionId() const A_WARN_UNUSED
+ InputActionT getActionId() const A_WARN_UNUSED
{ return mActionId; }
#ifdef USE_SDL2
@@ -148,7 +151,7 @@ class KeyEvent: public InputGuiEvent
*/
KeyEventTypeT mType;
- int mActionId;
+ InputActionT mActionId;
};
#endif // EVENTS_KEYEVENT_H