X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.h;h=000b0fb31c9199dc7f1f372fb4aa402c5221f71c;hb=2abe7714078a0f772af2e3e2675d6f2b3c054e08;hp=2f718ff722edfa3971ec7e2f8bf2d20a030e4378;hpb=2177259e395eaf1a2c6252e815fac538bab6a015;p=lyx.git

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 2f718ff722..000b0fb31c 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -21,6 +21,9 @@
 
 namespace lyx {
 
+// current LFUN format
+static unsigned int const LFUN_FORMAT = 5; // spitz: 2.4.x changes
+
 class FuncRequest;
 class LyXErr;
 
@@ -37,7 +40,7 @@ public:
 		Math,    //< Mathematics
 		Buffer,  //< Buffer and window related
 		Layout,  //< Font, Layout and textclass related
-		System,  //< Lyx preference, server etc
+		System   //< Lyx preference, server etc
 	};
 
 private:
@@ -45,7 +48,7 @@ private:
 	struct FuncInfo {
 		/// the action name
 		std::string name;
-		/// the func_attrib values set
+		/// the FuncAttribs values set
 		unsigned int attrib;
 		/// the category of this func
 		FuncType type;
@@ -55,22 +58,17 @@ private:
 	/// type for map between an action and its info
 	typedef std::map<FuncCode, FuncInfo> InfoMap;
 
-
 public:
-	/// noncopyable
-	LyXAction(LyXAction const &);
-	void operator=(LyXAction const &);
-
 	/// possible "permissions" for an action
 	enum FuncAttribs {
 		Noop = 0, //< Nothing special about this func
-		ReadOnly = 1, //< Can be used in RO mode (perhaps this should change); no automatic markDirty
+		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
 		NoUpdate = 8, //< Does not (usually) require update
 		SingleParUpdate = 16, //< Usually only requires this par updated
 		AtPoint = 32, //< dispatch first to inset at cursor if there is one
-		NoInternal = 64, //< Cannot be used for internal, non-document Buffers
+		NoInternal = 64 //< Cannot be used for internal, non-document Buffers
 	};
 
 	LyXAction();
@@ -79,7 +77,7 @@ public:
 	 * Creates a FuncRequest from a string of the form:
 	 *   lyx-function [argument]
 	 * where the argument is optional and "lyx-function" is in the form you'd
-	 * enter it in the mini-buffer. 
+	 * enter it in the mini-buffer.
 	 */
 	FuncRequest lookupFunc(std::string const & func_name) const;
 
@@ -92,16 +90,20 @@ public:
 	/// True if the command has `flag' set
 	bool funcHasFlag(FuncCode action, FuncAttribs flag) const;
 
-	/// iterator across all real actions
+	/// iterator across all LFUNs
 	typedef FuncMap::const_iterator const_iterator;
 
-	/// return an iterator to the start of all real actions
-	const_iterator func_begin() const;
+	/// return an iterator to the start of the list of LFUNs
+	const_iterator begin() const;
 
-	/// return an iterator to the end of all real actions
-	const_iterator func_end() const;
+	/// return an iterator to one past the end of the list of LFUNs
+	const_iterator end() const;
 
 private:
+	/// noncopyable
+	LyXAction(LyXAction const &);
+	void operator=(LyXAction const &);
+
 	/// populate the action container with our actions
 	void init();
 	/// add the given action