X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFuncRequest.h;h=993f0a24bbcca4436a96e85ae31b39cb282edc64;hb=aee4e7ba34d87f609ea50327449b3eb67731561a;hp=9ea6dc43447ed733b5605165661d4a658548055a;hpb=1a77c867a23f6f904f24b4968bdeb41e4244ccec;p=lyx.git

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 9ea6dc4344..993f0a24bb 100644
--- a/src/FuncRequest.h
+++ b/src/FuncRequest.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,22 +12,21 @@
 #ifndef FUNCREQUEST_H
 #define FUNCREQUEST_H
 
-#include "lfuns.h"
-#include "frontends/mouse_state.h"
+#include "FuncCode.h"
 
 #include "support/docstring.h"
 
-#include <iosfwd>
+#include "frontends/mouse_state.h"
 
 
 namespace lyx {
 
-
 /**
  * This class encapsulates a LyX action and its argument
  * in order to pass it around easily.
  */
-class FuncRequest {
+class FuncRequest
+{
 public:
 	/// Where the request came from
 	enum Origin {
@@ -35,21 +34,22 @@ public:
 		MENU, // A menu entry
 		TOOLBAR, // A toolbar icon
 		KEYBOARD, // a keyboard binding
-		COMMANDBUFFER
+		COMMANDBUFFER, 
+		TOC
 	};
 
 	/// just for putting these things in std::container
 	explicit FuncRequest(Origin o = INTERNAL);
 	/// actions without extra argument
-	explicit FuncRequest(kb_action act, Origin o = INTERNAL);
+	explicit FuncRequest(FuncCode act, Origin o = INTERNAL);
 	/// actions without extra argument
-	FuncRequest(kb_action act, int x, int y, mouse_button::state button,
+	FuncRequest(FuncCode act, int x, int y, mouse_button::state button,
 		    Origin o = INTERNAL);
 	/// actions with extra argument
-	FuncRequest(kb_action act, docstring const & arg,
+	FuncRequest(FuncCode act, docstring const & arg,
 		    Origin o = INTERNAL);
 	/// actions with extra argument. FIXME: remove this
-	FuncRequest(kb_action act, std::string const & arg,
+	FuncRequest(FuncCode act, std::string const & arg,
 		    Origin o = INTERNAL);
 	/// for changing requests a bit
 	FuncRequest(FuncRequest const & cmd, docstring const & arg,
@@ -64,6 +64,10 @@ public:
 	/// argument parsing, extract argument i as std::string
 	std::string getArg(unsigned int i) const;
 
+	/// argument parsing, extract argument i as std::string,
+	/// eating all characters up to the end of the command line
+	std::string getLongArg(unsigned int i) const;
+
 	/// access the whole argument
 	docstring const & argument() const { return argument_; }
 
@@ -73,7 +77,7 @@ public:
 	static FuncRequest const noaction;
 public:  // should be private
 	/// the action
-	kb_action action;
+	FuncCode action;
 private:
 	/// the action's string argument
 	docstring argument_;