Partially revert r34995, which broke math output. Not sure why yet....

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index e9843eb39937050b3c47873c0d1808cf2480f3f7..0b578590fa768e69e39024a32ee7c7486da14db7 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -34,11 +34,18 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum OverwriteFiles {
+       NO_FILES,
+       MAIN_FILE,
+       ALL_FILES,
+       UNSPECIFIED
+};
+
 extern bool use_gui;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
-class LyXView;
 }
 
 namespace graphics {
@@ -55,9 +62,6 @@ public:
        /// Execute LyX.
        int exec(int & argc, char * argv[]);
 
-       ///
-       frontend::LyXView * newLyXView();
-
 private:
        /// noncopyable
        LyX(LyX const &);
@@ -127,8 +131,8 @@ private:
        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);
@@ -164,6 +168,9 @@ FuncStatus getStatus(FuncRequest const & action);
 ///
 void dispatch(FuncRequest const & action);
 
+///
+void dispatch(FuncRequest const & action, DispatchResult & dr);
+
 } // namespace lyx
 
 #endif // LYX_H