Replace LString.h with support/std_string.h,

[features.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 9425345fa0211ee853c98a98198c2c76a278e145..d1892d8737f42c5c8c48fbc2a32048dc4bf813cd 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -1,17 +1,26 @@
 // -*- C++ -*-
 /**
  * \file LyXAction.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXACTION_H
 #define LYXACTION_H
 
-#include <map>
+#include "lfuns.h"
 
-#include "funcrequest.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
+#include <map>
+
+
+class FuncRequest;
 
 /**
  * This class is a container for LyX actions. It also
@@ -28,8 +37,6 @@ private:
                string name;
                /// the func_attrib values set
                unsigned int attrib;
-               /// the help text for this action
-               string helpText;
        };
 
 public:
@@ -76,9 +83,6 @@ public:
        /// Return the name (and argument) associated with the given (pseudo) action
        string const getActionName(int action) const;
 
-       /// Return one line help text associated with (pseudo)action
-       string const helpText(int action) const;
-
        /// True if the command has `flag' set
        bool funcHasFlag(kb_action action, func_attrib flag) const;
 
@@ -95,8 +99,7 @@ private:
        /// populate the action container with our actions
        void init();
        /// add the given action
-       void newFunc(kb_action, string const & name,
-                    string const & helpText, unsigned int attrib);
+       void newFunc(kb_action, string const & name, unsigned int attrib);
 
        /**
         * This is a list of all the LyXFunc names with the
@@ -107,7 +110,7 @@ private:
 
        /**
         * This is a mapping from action number to an object holding
-        * info about this action. f.ex. helptext, command name (string),
+        * info about this action. f.ex. command name (string),
         * command attributes (ro)
         */
        info_map lyx_info_map;