fix typo that put too many include paths for most people

[lyx.git] / src / MenuBackend.h

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 169b9d56183794d59f6761d4035f4f9cd4a22250..6f4bf989dbc9dc96acaf734fd1a4ce17284c662a 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -1,10 +1,10 @@
 /* This file is part of              -*- C++ -*-
 * ======================================================
-* 
+*
 *           LyX, The Document Processor
 *
 *           Copyright 1995 Matthias Ettrich
-*           Copyright 1995-2000 The LyX Team.
+*           Copyright 1995-2001 The LyX Team.
 *
 *           This file is Copyright 1999
 *           Jean-Marc Lasgouttes
@@ -19,7 +19,6 @@
 #endif
 
 #include "LString.h"
-#include "support/lstrings.h"
 #include <vector>
 
 class LyXLex;
@@ -44,8 +43,6 @@ public:
                Documents,
                ///
                Toc,
-               ///
-               References,
                /** This is a list of viewable formats
                    typically for the File->View menu. */
                ViewFormats,
@@ -57,28 +54,34 @@ public:
                ExportFormats,
                /** This is a list of importable formats
                    typically for the File->Export menu. */
-               ImportFormats
+               ImportFormats,
+               /** This is the list of floats that we can
+                   insert a list for. */
+               FloatListInsert,
+               /** This is the list of floats that we can
+                   insert. */
+               FloatInsert
        };
        /// Create a Command type MenuItem
-       MenuItem(Kind kind, 
-                string const & label = string(), 
-                string const & command = string(), 
+       MenuItem(Kind kind,
+                string const & label = string(),
+                string const & command = string(),
                 bool optional = false);
        MenuItem(Kind kind,
-                string const & label, 
-                int action, 
+                string const & label,
+                int action,
                 bool optional = false)
                : kind_(kind), label_(label),
                  action_(action), submenu_(), optional_(optional) {}
- 
+
        /// The label of a given menuitem
-       string const label() const { return token(label_, '|', 0); }
+       string const label() const;
        /// The keyboard shortcut (usually underlined in the entry)
-       string const shortcut() const { return token(label_, '|', 1); }
+       string const shortcut() const;
        /// The complete label, with label and shortcut separated by a '|'
        string const fulllabel() const { return label_;}
        /// The kind of entry
-       Kind kind() const { return kind_; } 
+       Kind kind() const { return kind_; }
        /// the action (if relevant)
        int action() const { return action_; }
        /// the description of the  submenu (if relevant)
@@ -107,7 +110,7 @@ public:
        ///
        typedef ItemList::const_iterator const_iterator;
        ///
-       explicit Menu(string const & name = string(), bool mb = false) 
+       explicit Menu(string const & name = string(), bool mb = false)
                : menubar_(mb), name_(name) {}
        ///
        Menu & add(MenuItem const &);
@@ -119,26 +122,28 @@ public:
            ViewFormats, ExportFormats, UpdateFormats
        */
        void expand(Menu & tomenu, Buffer *) const;
-       /// 
+       ///
        bool menubar() const { return menubar_; }
-       /// 
+       ///
        string const & name() const { return name_; }
        ///
        bool empty() const { return items_.empty(); }
        ///
        ItemList::size_type size() const { return items_.size(); }
-        ///
-        const_iterator begin() const {
-                return items_.begin();
-        }
-        ///
-        const_iterator end() const {
-                return items_.end();
-        }
+       ///
+       bool hasSubmenu(string const &) const;
+       ///
+       const_iterator begin() const {
+               return items_.begin();
+       }
+       ///
+       const_iterator end() const {
+               return items_.end();
+       }
 
        // Check whether the menu shortcuts are unique
        void checkShortcuts() const;
-       
+
 private:
        ///
        ItemList items_;
@@ -163,21 +168,21 @@ public:
        ///
        void add(Menu const &);
        ///
-       bool hasMenu (string const &) const;
+       bool hasMenu(string const &) const;
        ///
        Menu & getMenu (string const &);
        ///
        Menu const & getMenu (string const &) const;
        //
        bool empty() const { return menulist_.empty(); }
-        ///
-        const_iterator begin() const {
-                return menulist_.begin();
-        }
-        ///
-        const_iterator end() const {
-                return menulist_.end();
-        }
+       ///
+       const_iterator begin() const {
+               return menulist_.begin();
+       }
+       ///
+       const_iterator end() const {
+               return menulist_.end();
+       }
 private:
        ///
        MenuList menulist_;