fix msvc warning, somehow msvc thinks !line[0] is a boolean

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index dd98a370a5240f38c6546927ef56e9e5eaf2b62d..4e66f2c19624ed1ccbfa31b0a691494a710c5c6a 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -34,14 +36,22 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
-enum overwrite_files {
+enum RunMode {
+       NEW_INSTANCE,
+       USE_REMOTE,
+       PREFERRED
+};
+
+enum OverwriteFiles {
        NO_FILES,
        MAIN_FILE,
-       ALL_FILES
+       ALL_FILES,
+       UNSPECIFIED
 };
 
 extern bool use_gui;
-extern overwrite_files force_overwrite;
+extern RunMode run_mode;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
@@ -98,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.
@@ -125,6 +137,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();