Fix another use of unqualified std::move

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index bf83a5f330373c087ad83eace97c732edb7ba593..000b0fb31c9199dc7f1f372fb4aa402c5221f71c 100644 (file)
--- 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;
 
@@ -59,7 +62,7 @@ public:
        /// 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
@@ -74,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;
 
@@ -91,10 +94,10 @@ public:
        typedef FuncMap::const_iterator const_iterator;
 
        /// return an iterator to the start of the list of LFUNs
-       const_iterator func_begin() const;
+       const_iterator begin() const;
 
        /// return an iterator to one past the end of the list of LFUNs
-       const_iterator func_end() const;
+       const_iterator end() const;
 
 private:
        /// noncopyable