X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=0b1e02ea06762ad3a5eff02deea994b8383c3f7c;hb=11adfbf64ddd815d2dd8a16e03a528aee837866e;hp=0b578590fa768e69e39024a32ee7c7486da14db7;hpb=161af56f4e0c0b84bdfc150f0c6cbc67f2d184b2;p=lyx.git

diff --git a/src/LyX.h b/src/LyX.h
index 0b578590fa..0b1e02ea06 100644
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -34,6 +36,12 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum RunMode {
+	NEW_INSTANCE,
+	USE_REMOTE,
+	PREFERRED
+};
+
 enum OverwriteFiles {
 	NO_FILES,
 	MAIN_FILE,
@@ -42,16 +50,13 @@ enum OverwriteFiles {
 };
 
 extern bool use_gui;
+extern RunMode run_mode;
 extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
 }
 
-namespace graphics {
-class Previews;
-}
-
 /// initial startup
 class LyX {
 public:
@@ -99,7 +104,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.
@@ -126,6 +133,7 @@ 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();
@@ -139,7 +147,6 @@ private:
 	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 CmdDef & theTopLevelCmdDef();
 	friend SpellChecker * theSpellChecker();