X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=ccce7a31549bf1f1099a9db0944f8bc1d4ea87f9;hb=49ac79100bc36bcd8e54c0224596ae36af9c3c77;hp=e9843eb39937050b3c47873c0d1808cf2480f3f7;hpb=377cdd5f6cc2dd67fabd0b03703d20722a9ed0ea;p=lyx.git

diff --git a/src/LyX.h b/src/LyX.h
index e9843eb399..ccce7a3154 100644
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -26,6 +28,7 @@ class ErrorItem;
 class FuncRequest;
 class FuncStatus;
 class KeyMap;
+class LaTeXFonts;
 class Messages;
 class Mover;
 class Movers;
@@ -34,30 +37,37 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum RunMode {
+	NEW_INSTANCE,
+	USE_REMOTE,
+	PREFERRED
+};
+
+enum OverwriteFiles {
+	NO_FILES,
+	MAIN_FILE,
+	ALL_FILES,
+	UNSPECIFIED
+};
+
 extern bool use_gui;
+extern RunMode run_mode;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
-class LyXView;
-}
-
-namespace graphics {
-class Previews;
 }
 
 /// initial startup
 class LyX {
+	friend class LyXConsoleApp;
 public:
-
 	LyX();
 	~LyX();
 
 	/// Execute LyX.
 	int exec(int & argc, char * argv[]);
 
-	///
-	frontend::LyXView * newLyXView();
-
 private:
 	/// noncopyable
 	LyX(LyX const &);
@@ -75,6 +85,9 @@ private:
 	*/
 	int init(int & argc, char * argv[]);
 
+	/// Execute commandline commands if no GUI was requested.
+	int execWithoutGui(int & argc, char * argv[]);
+
 	/// Execute batch commands if available.
 	void execCommands();
 
@@ -95,7 +108,9 @@ private:
 	 */
 	bool queryUserLyXDir(bool explicit_userdir);
 	/// read lyxrc/preferences
-	bool readRcFile(std::string const & name);
+	/// \param check_format: whether to try to convert the format of
+	/// the file, if there is a mismatch.
+	bool readRcFile(std::string const & name, bool check_format = false);
 	/// read the given languages file
 	bool readLanguagesFile(std::string const & name);
 	/// read the encodings.
@@ -122,25 +137,25 @@ private:
 	friend FuncStatus getStatus(FuncRequest const & action);
 	friend void dispatch(FuncRequest const & action);
 	friend void dispatch(FuncRequest const & action, DispatchResult & dr);
+	friend std::vector<std::string> & theFilesToLoad();
 	friend BufferList & theBufferList();
 	friend Server & theServer();
 	friend ServerSocket & theServerSocket();
 	friend Converters & theConverters();
 	friend Converters & theSystemConverters();
-	friend Messages & getMessages(std::string const & language);
-	friend Messages & getGuiMessages();
+	friend Messages const & getMessages(std::string const & language);
+	friend Messages const & getGuiMessages();
 	friend KeyMap & theTopLevelKeymap();
 	friend Movers & theMovers();
-	friend Mover const & getMover(std::string  const & fmt);
+	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();
-	friend graphics::Previews & thePreviews();
 	friend Session & theSession();
+	friend LaTeXFonts & theLaTeXFonts();
 	friend CmdDef & theTopLevelCmdDef();
 	friend SpellChecker * theSpellChecker();
 	friend void setSpellChecker();
-	friend void setRcGuiLanguage();
 	friend void emergencyCleanup();
 	friend void execBatchCommands();
 	friend void lyx_exit(int exit_code);
@@ -153,8 +168,6 @@ void emergencyCleanup();
 /// \p exit_code is 0 by default, if a non zero value is passed,
 /// emergencyCleanup() will be called before exiting.
 void lyx_exit(int exit_code);
-/// Set the language defined by the user.
-void setRcGuiLanguage();
 /// Execute batch commands if available.
 void execBatchCommands();
 
@@ -164,7 +177,9 @@ FuncStatus getStatus(FuncRequest const & action);
 ///
 void dispatch(FuncRequest const & action);
 
+///
+void dispatch(FuncRequest const & action, DispatchResult & dr);
+
 } // namespace lyx
 
 #endif // LYX_H
-