[Scummvm-cvs-logs] scummvm master -> e1e9bd5c0e6d8b2593c0d25970eb7d121146d961

[tsoliman]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e1e9bd5c0e KEYMAPPER: Clean up more dead code


Commit: e1e9bd5c0e6d8b2593c0d25970eb7d121146d961
    https://github.com/scummvm/scummvm/commit/e1e9bd5c0e6d8b2593c0d25970eb7d121146d961
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2012-02-21T11:39:05-08:00

Commit Message:
KEYMAPPER: Clean up more dead code

More automapper related dead code

Changed paths:
    backends/keymapper/action.cpp
    backends/keymapper/action.h



diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp
index 515ec70..e5b2d94 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 bf3773b..3132260 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