X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.h;h=4d66c0f76b593ea6c0cba96dafe6022a75b7a539;hb=2bb86211292f416cd584023feb23dc3b86bc1761;hp=d1892d8737f42c5c8c48fbc2a32048dc4bf813cd;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/LyXAction.h b/src/LyXAction.h
index d1892d8737..4d66c0f76b 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -15,10 +15,10 @@
 
 #include "lfuns.h"
 
-#include "support/std_string.h"
 #include <boost/utility.hpp>
-#include <map>
 
+#include <map>
+#include <string>
 
 class FuncRequest;
 
@@ -34,29 +34,25 @@ private:
 	/// information for an action
 	struct func_info {
 		/// the action name
-		string name;
+		std::string name;
 		/// the func_attrib values set
 		unsigned int attrib;
 	};
 
 public:
 	/// type for map between a function name and its action
-	typedef std::map<string, kb_action> func_map;
+	typedef std::map<std::string, kb_action> func_map;
 	/// type for map between an action and its info
 	typedef std::map<kb_action, func_info> info_map;
-	/// type for a map between a pseudo-action and its stored action/arg
-	typedef std::map<unsigned int, FuncRequest> pseudo_map;
-	/// map from argument to pseudo-action
-	typedef std::map<string, unsigned int> arg_item;
-	/// map from an action to all its dependent pseudo-actions
-	typedef std::map<kb_action, arg_item> arg_map;
 
 	/// possible "permissions" for an action
 	enum func_attrib {
 		Noop = 0, //< nothing special about this func
 		ReadOnly = 1, //< can be used in RO mode (perhaps this should change)
 		NoBuffer = 2, //< Can be used when there is no document open
-		Argument = 4 //< Requires argument
+		Argument = 4, //< Requires argument
+		NoUpdate = 8, //< Does not (usually) require update
+		SingleParUpdate = 16 //< Usually only requires this par updated
 	};
 
 	LyXAction();
@@ -66,22 +62,10 @@ public:
 	 * If you include arguments in func_name, a new pseudoaction
 	 * will be created if needed.
 	 */
-	int LookupFunc(string const & func_name);
-
-	/// Returns a pseudo-action given an action and its argument.
-	int getPseudoAction(kb_action action, string const & arg);
-
-	/**
-	 * Given a pseudo-action, return the real action and
-	 * associated argument
-	 */
-	FuncRequest retrieveActionArg(int pseudo) const;
-
-	/// Search for an existent pseudoaction, return -1 if it doesn't exist.
-	int searchActionArg(kb_action action, string const & arg) const;
+	FuncRequest lookupFunc(std::string const & func_name) const;
 
 	/// Return the name (and argument) associated with the given (pseudo) action
-	string const getActionName(int action) const;
+	std::string const getActionName(kb_action action) const;
 
 	/// True if the command has `flag' set
 	bool funcHasFlag(kb_action action, func_attrib flag) const;
@@ -99,7 +83,7 @@ private:
 	/// populate the action container with our actions
 	void init();
 	/// add the given action
-	void newFunc(kb_action, string const & name, unsigned int attrib);
+	void newFunc(kb_action, std::string const & name, unsigned int attrib);
 
 	/**
 	 * This is a list of all the LyXFunc names with the
@@ -114,18 +98,6 @@ private:
 	 * command attributes (ro)
 	 */
 	info_map lyx_info_map;
-
-	/**
-	 * A mapping from the automatically created pseudo action number
-	 * to the real action and its argument.
-	 */
-	pseudo_map lyx_pseudo_map;
-
-	/**
-	 * A (multi) mapping from the lyx action to all the generated
-	 * pseudofuncs and the arguments the action should use.
-	 */
-	arg_map lyx_arg_map;
 };
 
 /// singleton instance