Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index ccce7a31549bf1f1099a9db0944f8bc1d4ea87f9..a19b5234594047a81bec19802efa9d1f80df4c64 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -91,13 +91,6 @@ private:
        /// Execute batch commands if available.
        void execCommands();
 
-       /// Load files passed at command-line.
-       /// return true on success false if we encounter an error
-       /**
-       This method is used only in non-GUI mode.
-       */
-       bool loadFiles();
-
        /// initial LyX set up
        bool init();
        /** Check for the existence of the user's support directory and,
@@ -135,7 +128,7 @@ private:
        bool first_start;
 
        friend FuncStatus getStatus(FuncRequest const & action);
-       friend void dispatch(FuncRequest const & action);
+       friend DispatchResult const & dispatch(FuncRequest const & action);
        friend void dispatch(FuncRequest const & action, DispatchResult & dr);
        friend std::vector<std::string> & theFilesToLoad();
        friend BufferList & theBufferList();
@@ -175,7 +168,7 @@ void execBatchCommands();
 FuncStatus getStatus(FuncRequest const & action);
 
 ///
-void dispatch(FuncRequest const & action);
+DispatchResult const & dispatch(FuncRequest const & action);
 
 ///
 void dispatch(FuncRequest const & action, DispatchResult & dr);