X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=b39ab729f0629252f71445c1222b04b904139313;hb=2515a3bded01e27dcc3b19502e649f01fff5ace0;hp=33f99241796881b735017e2a54077239ecec3eb2;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/LyX.h b/src/LyX.h
index 33f9924179..b39ab729f0 100644
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -21,20 +21,24 @@
 
 namespace lyx {
 
+namespace support {
+class FileName;
+}
+
 class Buffer;
 class BufferList;
 class Converters;
 class ErrorItem;
-class InsetBase;
+class Inset;
 class LyXFunc;
-class LyXServer;
-class LyXServerSocket;
+class Server;
+class ServerSocket;
 class LyXView;
 class Messages;
 class Mover;
 class Movers;
 class Session;
-class kb_keymap;
+class KeyMap;
 
 extern bool use_gui;
 
@@ -66,20 +70,20 @@ public:
 	LyXFunc & lyxFunc();
 	LyXFunc const & lyxFunc() const;
 	///
-	LyXServer & server();
-	LyXServer const & server() const;
+	Server & server();
+	Server const & server() const;
 	///
-	LyXServerSocket & socket();
-	LyXServerSocket const & socket() const;
+	ServerSocket & socket();
+	ServerSocket const & socket() const;
 
 	///
 	frontend::Application & application();
 	frontend::Application const & application() const;
 
 	///
-	kb_keymap & topLevelKeymap();
-	kb_keymap const & topLevelKeymap() const;
-	
+	KeyMap & topLevelKeymap();
+	KeyMap const & topLevelKeymap() const;
+
 	///
 	Converters & converters();
 	Converters & systemConverters();
@@ -97,11 +101,16 @@ public:
 	/** redraw \c inset in all the BufferViews in which it is currently
 	 *  visible. If successful return a pointer to the owning Buffer.
 	 */
-	Buffer const * const updateInset(InsetBase const *) const;
+	Buffer const * const updateInset(Inset const *) const;
+
+	void hideDialogs(std::string const & name, Inset * inset) const;
 
 	/// Execute batch commands if available.
 	void execBatchCommands();
 
+	///
+	void addFileToLoad(support::FileName const &);
+
 private:
 	/// Do some cleanup in preparation of an exit.
 	void prepareExit();
@@ -130,9 +139,9 @@ private:
 	/// initial LyX set up
 	bool init();
 	/// set up the default key bindings
-	void defaultKeyBindings(kb_keymap * kbmap);
+	void defaultKeyBindings(KeyMap * kbmap);
 	/// set up the default dead key bindings if requested
-	void deadKeyBindings(kb_keymap * kbmap);
+	void deadKeyBindings(KeyMap * kbmap);
 	/** Check for the existence of the user's support directory and,
 	 *  if not present, create it. Exits the program if the directory
 	 *  cannot be created.
@@ -150,7 +159,7 @@ private:
 	/// \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);
+			       std::string const & symbols_name);
 	/// parsing of non-gui LyX options.
 	void easyParse(int & argc, char * argv[]);
 	/// shows up a parsing error on screen