clean up a bit

[lyx.git] / src / MenuBackend.h

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 5cc405bf223b31072f4bbf9e92010dbb2fe8e148..12e38bf0a67112745b2526f8b2cf23dd0d586567 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -72,9 +72,7 @@ public:
        MenuItem(Kind kind,
                 string const & label,
                 int action,
-                bool optional = false)
-               : kind_(kind), label_(label),
-                 action_(action), submenuname_(), optional_(optional) {}
+                bool optional = false);
 
        /// This one is just to please boost::shared_ptr<>
        ~MenuItem();
@@ -88,14 +86,19 @@ public:
        Kind kind() const { return kind_; }
        /// the action (if relevant)
        int action() const { return action_; }
-       /// the description of the  submenu (if relevant)
-       string const & submenuname() const { return submenuname_; }
        /// returns true if the entry should be ommited when disabled
        bool optional() const { return optional_; }
+       /// the description of the  submenu (if relevant)
+       string const & submenuname() const { return submenuname_; }
+       /// the description of the  submenu (if relevant)
+       void submenuname(string const & name) { submenuname_ = name; }
+       ///
+       Menu * submenu() const { return submenu_.get(); }
        ///
-       Menu & submenu() const { return *submenu_.get(); }
+       void submenu(Menu * menu);
+
 private:
-       friend class MenuBackend;
+       //friend class MenuBackend;
        ///
        Kind kind_;
        ///
@@ -119,6 +122,8 @@ public:
        ///
        typedef ItemList::const_iterator const_iterator;
        ///
+       typedef ItemList::size_type size_type;
+       ///
        explicit Menu(string const & name = string())
                : name_(name) {}
        ///