* GuiView.C (updateTab): do not update early if current tab has

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 78427b757300e4be690209894fad001b8b242b9c..6c53bc6a01dd8ee1c2f853a0cf2b9c1c8b572c53 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -32,6 +32,8 @@ class LyXServer;
 class LyXServerSocket;
 class LyXView;
 class Messages;
+class Mover;
+class Movers;
 class Session;
 class kb_keymap;
 
@@ -144,11 +146,14 @@ private:
        /// read lyxrc/preferences
        bool readRcFile(std::string const & name);
        /// read the given ui (menu/toolbar) file
-       bool readUIFile(std::string const & name);
+       bool readUIFile(std::string const & name, bool include = false);
        /// read the given languages file
        bool readLanguagesFile(std::string const & name);
-       /// read the given encodings file
-       bool readEncodingsFile(std::string const & name);
+       /// read the encodings.
+       /// \param enc_name encodings definition file
+       /// \param symbols_name unicode->LaTeX mapping file
+       bool readEncodingsFile(std::string const & enc_name,
+                              std::string const & symbols_name);
        /// parsing of non-gui LyX options.
        void easyParse(int & argc, char * argv[]);
        /// shows up a parsing error on screen
@@ -162,6 +167,12 @@ private:
        /// Use the Pimpl idiom to hide the internals.
        struct Singletons;
        boost::scoped_ptr<Singletons> pimpl_;
+
+       friend Movers & theMovers();
+       friend Mover const & getMover(std::string  const & fmt);
+       friend void setMover(std::string const & fmt, std::string const & command);
+       friend Movers & theSystemMovers();
+       friend frontend::Application * theApp();
 };
 
 } // namespace lyx