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

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 70b8b7e8c6384f60aa93b92ac78b1ad613f4f3bf..a19b5234594047a81bec19802efa9d1f80df4c64 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -60,8 +60,8 @@ class Application;
 
 /// initial startup
 class LyX {
+       friend class LyXConsoleApp;
 public:
-
        LyX();
        ~LyX();
 
@@ -85,16 +85,12 @@ private:
        */
        int init(int & argc, char * argv[]);
 
+       /// Execute commandline commands if no GUI was requested.
+       int execWithoutGui(int & argc, char * argv[]);
+
        /// 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,
@@ -132,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();
@@ -172,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);