small changes to ButtonController usage

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 0fdc4c916b6ad4928e45b171c65a0804ba41f3cc..19790c32e5f9bcb473bfeca5393067012d779d68 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -7,39 +7,43 @@
 #endif
 
 #include <map>
-using std::map;
-using std::less;
 
 #include "commandtags.h"
 #include "LString.h"
+#include "support/utility.hpp"
 
 /** This class encapsulates LyX action and user command operations.
  */
-class LyXAction {
+class LyXAction : public noncopyable {
 private:
        ///
        struct func_info {
+               ///
                string name;
+               ///
                unsigned int attrib;
+               ///
                string helpText;
        };
 
        ///
        struct pseudo_func {
+               ///
                kb_action action;
+               ///
                string arg;
        };
 public:
        ///
-       typedef map<string, kb_action, less<string> > func_map;
+       typedef std::map<string, kb_action> func_map;
        ///
-       typedef map<kb_action, func_info, less<kb_action> > info_map;
+       typedef std::map<kb_action, func_info> info_map;
        ///
-       typedef map<unsigned int, pseudo_func, less<unsigned int> > pseudo_map;
+       typedef std::map<unsigned int, pseudo_func> pseudo_map;
        ///
-       typedef map<string, unsigned int, less<string> > arg_item;
+       typedef std::map<string, unsigned int> arg_item;
        ///
-       typedef map<kb_action, arg_item, less<kb_action> > arg_map;
+       typedef std::map<kb_action, arg_item> arg_map;
 
        ///
        enum func_attrib {
@@ -50,7 +54,8 @@ public:
                 /// Can be used when there is no document open
                 NoBuffer = 2,
                //Interactive = 2, // Is interactive (requires a GUI)
-               Argument=4      // Requires argument
+               ///
+               Argument = 4      // Requires argument
                //MathOnly = 8,    // Only math mode
                //EtcEtc = ...     // Or other attributes...
        };