X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.h;h=4411b16269cac11da73ca67dd286ac563787e4bc;hb=ce7c45bb437c44dae15f96148cb9b793ab0b895c;hp=3e0241acbd4ca124a50c4aeee7d679344be69c92;hpb=495cd0eea03f9f5471a247e60ce70abfd1114ada;p=lyx.git

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 3e0241acbd..4411b16269 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -15,10 +15,13 @@
 
 #include "lfuns.h"
 
-#include "support/std_string.h"
 #include <boost/utility.hpp>
+
 #include <map>
+#include <string>
+
 
+namespace lyx {
 
 class FuncRequest;
 
@@ -34,14 +37,14 @@ 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;
 
@@ -50,7 +53,9 @@ public:
 		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();
@@ -60,10 +65,10 @@ public:
 	 * If you include arguments in func_name, a new pseudoaction
 	 * will be created if needed.
 	 */
-	FuncRequest lookupFunc(string const & func_name) const;
+	FuncRequest lookupFunc(std::string const & func_name) const;
 
 	/// Return the name (and argument) associated with the given (pseudo) action
-	string const getActionName(kb_action 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;
@@ -81,7 +86,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
@@ -101,4 +106,7 @@ private:
 /// singleton instance
 extern LyXAction lyxaction;
 
+
+} // namespace lyx
+
 #endif // LYXACTION_H