X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.h;h=4d66c0f76b593ea6c0cba96dafe6022a75b7a539;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=3e0241acbd4ca124a50c4aeee7d679344be69c92;hpb=495cd0eea03f9f5471a247e60ce70abfd1114ada;p=lyx.git diff --git a/src/LyXAction.h b/src/LyXAction.h index 3e0241acbd..4d66c0f76b 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -15,10 +15,10 @@ #include "lfuns.h" -#include "support/std_string.h" #include -#include +#include +#include class FuncRequest; @@ -34,14 +34,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 func_map; + typedef std::map func_map; /// type for map between an action and its info typedef std::map info_map; @@ -50,7 +50,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 +62,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 +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