X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=4b9c201e258b86e1cbc3db8849639af6315f2e0b;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=70b8b7e8c6384f60aa93b92ac78b1ad613f4f3bf;hpb=62394258dacddc8d71a52adcecad0d7e8166db66;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index 70b8b7e8c6..4b9c201e25 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -51,6 +51,7 @@ enum OverwriteFiles { }; extern bool use_gui; +extern bool verbose; extern RunMode run_mode; extern OverwriteFiles force_overwrite; @@ -60,8 +61,8 @@ class Application; /// initial startup class LyX { + friend class LyXConsoleApp; public: - LyX(); ~LyX(); @@ -85,16 +86,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 +129,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 +169,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);