diff options
| author | Tarek Soliman | 2012-02-21 13:34:30 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-02-21 13:39:05 -0600 |
| commit | e1e9bd5c0e6d8b2593c0d25970eb7d121146d961 (patch) | |
| tree | 1794cb12d78b252608a49eeb3fe95e6645fa6df6 | |
| parent | 9ffe3e11d905b5af194dd3265e2fe11545bf5020 (diff) | |
| download | scummvm-rg350-e1e9bd5c0e6d8b2593c0d25970eb7d121146d961.tar.gz scummvm-rg350-e1e9bd5c0e6d8b2593c0d25970eb7d121146d961.tar.bz2 scummvm-rg350-e1e9bd5c0e6d8b2593c0d25970eb7d121146d961.zip | |
KEYMAPPER: Clean up more dead code
More automapper related dead code
| -rw-r--r-- | backends/keymapper/action.cpp | 5 | ||||
| -rw-r--r-- | backends/keymapper/action.h | 15 |
2 files changed, 3 insertions, 17 deletions
diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp index 515ec70e32..e5b2d9415a 100644 --- a/backends/keymapper/action.cpp +++ b/backends/keymapper/action.cpp @@ -28,9 +28,8 @@ namespace Common { -Action::Action(Keymap *boss, const char *i, String des, int pri, int flg) - : _boss(boss), description(des), - priority(pri), flags(flg), _hwKey(0) { +Action::Action(Keymap *boss, const char *i, String des) + : _boss(boss), description(des), _hwKey(0) { assert(i); assert(_boss); diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h index bf3773b7e3..3132260512 100644 --- a/backends/keymapper/action.h +++ b/backends/keymapper/action.h @@ -53,9 +53,6 @@ struct Action { /** Events to be sent when mapped key is pressed */ List<Event> events; - int priority; - int group; - int flags; private: /** Hardware key that is mapped to this Action */ @@ -63,8 +60,7 @@ private: Keymap *_boss; public: - Action(Keymap *boss, const char *id, String des = "", - int pri = 0, int flg = 0 ); + Action(Keymap *boss, const char *id, String des = ""); void addEvent(const Event &evt) { events.push_back(evt); @@ -106,15 +102,6 @@ public: }; -struct ActionPriorityComp : public BinaryFunction<Action, Action, bool> { - bool operator()(const Action *x, const Action *y) const { - return x->priority > y->priority; - } - bool operator()(const Action &x, const Action &y) const { - return x.priority > y.priority; - } -}; - } // End of namespace Common #endif // #ifdef ENABLE_KEYMAPPER |