Compil fix.

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

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index 1f214680f1210ba56c22c18971dc84c23430db08..4387aa570289b55b713bb74ef703569388ff6ed2 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -15,10 +15,9 @@
 
 #include "frontends/Application.h"
 
-#include <QObject>
 #include <QApplication>
-
-#include <vector>
+#include <QObject>
+#include <QList>
 
 class QSessionManager;
 class QAbstractItemModel;
@@ -37,6 +36,7 @@ class GlobalMenuBar;
 class GuiWorkArea;
 class Menus;
 class SocketNotifier;
+class Toolbars;
 
 /// The Qt main application class
 /**
@@ -65,14 +65,15 @@ public:
        bool event(QEvent * e);
        bool getRgbColor(ColorCode col, RGBColor & rgbcol);
        std::string const hexName(ColorCode col);
-       void readMenus(Lexer & lex);
        void registerSocketCallback(int fd, SocketCallback func);
        void unregisterSocketCallback(int fd);
-       bool searchMenu(FuncRequest const & func, std::vector<docstring> & names) const;
+       bool searchMenu(FuncRequest const & func, docstring_list & names) const;
        void hideDialogs(std::string const & name, Inset * inset) const;
        Buffer const * updateInset(Inset const * inset) const;
        //@}
 
+       Toolbars const & toolbars() const;
+       Toolbars & toolbars();
        Menus const & menus() const;
        Menus & menus();
        /// Methods inherited from \c QApplication class
@@ -95,9 +96,7 @@ public:
        ///
        void setCurrentView(GuiView * view) { current_view_ = view; }
        ///
-       size_t viewCount() const;
-       ///
-       std::vector<int> const & viewIds();
+       QList<int> viewIds() const;
 
        ///
        ColorCache & colorCache();
@@ -113,7 +112,7 @@ public:
        /// return a suitable monospaced font name.
        QString const typewriterFontName();
        ///
-       bool unregisterView(int id);
+       void unregisterView(GuiView * gv);
        ///
        GuiView & view(int id) const;
 
@@ -130,6 +129,9 @@ private Q_SLOTS:
 private:
        ///
        bool closeAllViews();
+       /// read the given ui (menu/toolbar) file
+       bool readUIFile(QString const & name, bool include = false);
+
        /// This LyXView is the one receiving Clipboard and Selection
        /// events
        GuiView * current_view_;