* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / Menus.h

diff --git a/src/frontends/qt4/Menus.h b/src/frontends/qt4/Menus.h
index 3fed41719d88b88175d46a7ed88b1d6981fa2267..1ab407a5e100c077f7193f1c28b98f777cabc3bb 100644 (file)
--- a/src/frontends/qt4/Menus.h
+++ b/src/frontends/qt4/Menus.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -13,16 +13,16 @@
 #ifndef MENUS_H
 #define MENUS_H
 
-#include "support/docstring.h"
-
 #include <QMenu>
 
 #include <vector>
 
 class QString;
+class QMenuBar;
 
 namespace lyx {
 
+class docstring_list;
 class Lexer;
 class FuncRequest;
 
@@ -37,8 +37,9 @@ public:
        ///
        Menu(GuiView * gv, QString const & name, bool top_level);
 
+       ///
        ~Menu();
-
+       
 private Q_SLOTS:
        ///
        void updateView();
@@ -57,12 +58,16 @@ class Menus
 {
 public:
        Menus();
+       ~Menus();
+
+       ///
+       void reset();
        
        ///
        bool searchMenu(FuncRequest const & func,
-               std::vector<docstring> & names) const;
+               docstring_list & names) const;
        ///
-       void fillMenuBar(GuiView * view);
+       void fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial = false);
 
        /// \return a top-level submenu given its name.
        Menu * menu(QString const & name, GuiView & view);
@@ -71,13 +76,13 @@ public:
        void read(Lexer &);
 
        ///
-       void updateMenu(QString const & name);
+       void updateMenu(Menu * qmenu);
 
 private:
        /// Use the Pimpl idiom to hide the internals.
        struct Impl;
-       /// The pointer never changes although *d's contents may.
-       Impl * const d;
+       ///
+       Impl * d;
 };
 
 } // namespace frontend