X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=162151286aafe72ecc736621141c04a42b839611;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=ccce7a31549bf1f1099a9db0944f8bc1d4ea87f9;hpb=7b48e2aac0d63fe23cbeadf6ddd50ab0c26c1b6e;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index ccce7a3154..162151286a 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -25,6 +25,7 @@ class CmdDef; class Converters; class DispatchResult; class ErrorItem; +class Formats; class FuncRequest; class FuncStatus; class KeyMap; @@ -51,8 +52,11 @@ enum OverwriteFiles { }; extern bool use_gui; +extern bool verbose; +extern bool ignore_missing_glyphs; extern RunMode run_mode; extern OverwriteFiles force_overwrite; +extern double qt_scale_factor; namespace frontend { class Application; @@ -91,13 +95,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 +132,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(); @@ -143,6 +140,8 @@ private: friend ServerSocket & theServerSocket(); friend Converters & theConverters(); friend Converters & theSystemConverters(); + friend Formats & theFormats(); + friend Formats & theSystemFormats(); friend Messages const & getMessages(std::string const & language); friend Messages const & getGuiMessages(); friend KeyMap & theTopLevelKeymap(); @@ -175,7 +174,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);