Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index d59666d698bfdf9041f54d654272fcc2693c6efa..4411b16269cac11da73ca67dd286ac563787e4bc 100644 (file)
--- 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.
         */
-       kb_action LookupFunc(string const & func_name);
+       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;
@@ -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