Compil fix.

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

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index cafa489436a34dfbbaa291417975e9dd8f3276fb..4387aa570289b55b713bb74ef703569388ff6ed2 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -36,6 +36,7 @@ class GlobalMenuBar;
 class GuiWorkArea;
 class Menus;
 class SocketNotifier;
+class Toolbars;
 
 /// The Qt main application class
 /**
@@ -66,11 +67,13 @@ public:
        std::string const hexName(ColorCode col);
        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
@@ -127,7 +130,7 @@ private:
        ///
        bool closeAllViews();
        /// read the given ui (menu/toolbar) file
-       bool readUIFile(std::string const & name, bool include = false);
+       bool readUIFile(QString const & name, bool include = false);
 
        /// This LyXView is the one receiving Clipboard and Selection
        /// events