line up the vars

[chaz/openbox] / util / epist / actions.hh

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 531d54d21f3349a7db99ed8904f5ecd117c7b47e..b211bf9d5599b3c29064b18b85e9cf189327f20d 100644 (file)
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -47,15 +47,15 @@ public:
 
     nextWindow,
     prevWindow,
-    nextWindowOnAllDesktops,
-    prevWindowOnAllDesktops,
+    nextWindowOnAllWorkspaces,
+    prevWindowOnAllWorkspaces,
 
     nextWindowOfClass,
     prevWindowOfClass,
 
-    changeDesktop,
-    nextDesktop,
-    prevDesktop,
+    changeWorkspace, //done
+    nextWorkspace, //done
+    prevWorkspace, //done
 
     // these are openbox extensions
     showRootMenu,
@@ -73,16 +73,19 @@ public:
 private:
   enum ActionType _type;
   const KeyCode _keycode;
-  const int _modifierMask;
-  
+  const unsigned int _modifierMask;
+
+  const int _numberParam;
 public:
   inline enum ActionType type() const { return _type;}
   inline const KeyCode keycode() const { return _keycode; }
-  inline const int modifierMask() const { return _modifierMask; }
+  inline const unsigned int modifierMask() const { return _modifierMask; }
+  inline const int number() const { return _numberParam; }
 
-  Action::Action(enum ActionType type, KeyCode keycode, int modifierMask);
+  Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
+         int number = 0);
 };
   
-typedef list<Action> ActionList;
+typedef std::list<Action> ActionList;
 
 #endif