* src/text2.C: deleteEmptyParagraphMechanism(): fix a crash in

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 9b228c6639efad34939b9e406f69d94aa7fabd0e..4145c78b842991f0f48065cebe6677cc2ad1df53 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -23,6 +23,7 @@ namespace lyx {
 
 class Buffer;
 class BufferList;
+class Converters;
 class ErrorItem;
 class IconvProcessor;
 class InsetBase;
@@ -30,6 +31,9 @@ class LyXFunc;
 class LyXServer;
 class LyXServerSocket;
 class LyXView;
+class Messages;
+class Mover;
+class Movers;
 class Session;
 class kb_keymap;
 
@@ -76,6 +80,17 @@ public:
        ///
        kb_keymap & topLevelKeymap();
        kb_keymap const & topLevelKeymap() const;
+       
+       ///
+       Converters & converters();
+       Converters & systemConverters();
+
+       ///
+       Messages & getMessages(std::string const & language);
+       ///
+       Messages & getGuiMessages();
+       ///
+       void setGuiLanguage(std::string const & language);
 
        ///
        IconvProcessor & iconvProcessor();
@@ -131,7 +146,7 @@ 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
@@ -149,6 +164,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