(finishing patch -- question was restored, but there were still problems)

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 8c1fe648a22a8412b5b0352589ca07bb676c008a..c9674eba37ad29ecd55d063536dcdec0a6ad288b 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -26,7 +28,6 @@ class ErrorItem;
 class FuncRequest;
 class FuncStatus;
 class KeyMap;
-class LyXFunc;
 class Messages;
 class Mover;
 class Movers;
@@ -35,11 +36,25 @@ 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 {
@@ -56,9 +71,6 @@ public:
        /// Execute LyX.
        int exec(int & argc, char * argv[]);
 
-       ///
-       frontend::LyXView * newLyXView();
-
 private:
        /// noncopyable
        LyX(LyX const &);
@@ -123,14 +135,14 @@ 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 LyXFunc & theLyXFunc();
        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);
@@ -160,6 +172,15 @@ void setRcGuiLanguage();
 /// Execute batch commands if available.
 void execBatchCommands();
 
+///
+FuncStatus getStatus(FuncRequest const & action);
+
+///
+void dispatch(FuncRequest const & action);
+
+///
+void dispatch(FuncRequest const & action, DispatchResult & dr);
+
 } // namespace lyx
 
 #endif // LYX_H