X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=a19b5234594047a81bec19802efa9d1f80df4c64;hb=4b64aaf4ce026aacce02cfda58dcb1cd954f4adb;hp=70b8b7e8c6384f60aa93b92ac78b1ad613f4f3bf;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index 70b8b7e8c6..a19b523459 100644 --- 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 & 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);