* Hartmut's csv2lyx script

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 70fda4ab94acab1fd821e7459226e9df52c79492..d3f8c51d47313c62add43adacab90c2e735191fb 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -13,7 +13,7 @@
 #ifndef LYXACTION_H
 #define LYXACTION_H
 
-#include "lfuns.h"
+#include "FuncCode.h"
 
 #include <map>
 #include <string>
@@ -26,7 +26,7 @@ class FuncRequest;
 /**
  * This class is a container for LyX actions. It also
  * stores and managers "pseudo-actions". Pseudo-actions
- * are not part of the kb_action enum, but are created
+ * are not part of the FuncCode enum, but are created
  * dynamically, for encapsulating a real action and an
  * argument. They are used for things like the menus.
  */
@@ -44,7 +44,7 @@ public:
 
 private:
        /// information for an action
-       struct func_info {
+       struct FuncInfo {
                /// the action name
                std::string name;
                /// the func_attrib values set
@@ -59,9 +59,9 @@ public:
        void operator=(LyXAction const &);
 
        /// type for map between a function name and its action
-       typedef std::map<std::string, kb_action> func_map;
+       typedef std::map<std::string, FuncCode> func_map;
        /// type for map between an action and its info
-       typedef std::map<kb_action, func_info> info_map;
+       typedef std::map<FuncCode, FuncInfo> info_map;
 
        /// possible "permissions" for an action
        enum func_attrib {
@@ -83,12 +83,12 @@ public:
        FuncRequest lookupFunc(std::string const & func_name) const;
 
        /// Return the name (and argument) associated with the given (pseudo) action
-       std::string const getActionName(kb_action action) const;
+       std::string const getActionName(FuncCode action) const;
 
-       func_type const getActionType(kb_action action) const;
+       func_type const getActionType(FuncCode action) const;
 
        /// True if the command has `flag' set
-       bool funcHasFlag(kb_action action, func_attrib flag) const;
+       bool funcHasFlag(FuncCode action, func_attrib flag) const;
 
        /// iterator across all real actions
        typedef func_map::const_iterator const_func_iterator;
@@ -103,7 +103,7 @@ private:
        /// populate the action container with our actions
        void init();
        /// add the given action
-       void newFunc(kb_action, std::string const & name, unsigned int attrib, func_type type);
+       void newFunc(FuncCode, std::string const & name, unsigned int attrib, func_type type);
 
        /**
         * This is a list of all the LyXFunc names with the