some changes to make some compilers somewhat happier

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index cf611e3c35283903d8687031497598d3ee77424e..c48d599e226be5da25cf891ee0a0b315746c7b16 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -10,11 +10,11 @@
 
 #include "commandtags.h"
 #include "LString.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 /** This class encapsulates LyX action and user command operations.
  */
-class LyXAction : public noncopyable {
+class LyXAction : boost::noncopyable {
 private:
        ///
        struct func_info {
@@ -83,7 +83,7 @@ public:
        kb_action retrieveActionArg(int i, string & arg) const;
     
        /// Search for an existent pseudoaction, return -1 if it doesn't exist.
-       int searchActionArg(kb_action action, string const & arg) const;
+       kb_action searchActionArg(kb_action action, string const & arg) const;
 
        /// Check if a value is a pseudo-action. 
        bool isPseudoAction(int) const;
@@ -97,6 +97,9 @@ public:
        /// True if the command has `flag' set
        bool funcHasFlag(kb_action action, func_attrib flag) const;
 
+       typedef func_map::const_iterator const_func_iterator;
+       const_func_iterator func_begin() const;
+       const_func_iterator func_end() const;
 private:
        ///
        void init();