X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.h;h=6c53bc6a01dd8ee1c2f853a0cf2b9c1c8b572c53;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=01357b88539e0adaf4bba3381263a54e9e8c3e0e;hpb=197ca2420b20d468fb2f4a5bd5b5ec69e15d8c6f;p=lyx.git

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 01357b8853..6c53bc6a01 100644
--- 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;
@@ -31,6 +32,8 @@ class LyXServer;
 class LyXServerSocket;
 class LyXView;
 class Messages;
+class Mover;
+class Movers;
 class Session;
 class kb_keymap;
 
@@ -77,6 +80,10 @@ public:
 	///
 	kb_keymap & topLevelKeymap();
 	kb_keymap const & topLevelKeymap() const;
+	
+	///
+	Converters & converters();
+	Converters & systemConverters();
 
 	///
 	Messages & getMessages(std::string const & language);
@@ -139,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
@@ -157,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