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

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 4e66f2c19624ed1ccbfa31b0a691494a710c5c6a..a19b5234594047a81bec19802efa9d1f80df4c64 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -28,6 +28,7 @@ class ErrorItem;
 class FuncRequest;
 class FuncStatus;
 class KeyMap;
+class LaTeXFonts;
 class Messages;
 class Mover;
 class Movers;
@@ -57,14 +58,10 @@ namespace frontend {
 class Application;
 }
 
-namespace graphics {
-class Previews;
-}
-
 /// initial startup
 class LyX {
+       friend class LyXConsoleApp;
 public:
-
        LyX();
        ~LyX();
 
@@ -88,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,
@@ -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();
@@ -147,16 +140,15 @@ private:
        friend Messages const & getGuiMessages();
        friend KeyMap & theTopLevelKeymap();
        friend Movers & theMovers();
-       friend Mover const & getMover(std::string  const & fmt);
+       friend Mover const & getMover(std::string const & fmt);
        friend void setMover(std::string const & fmt, std::string const & command);
        friend Movers & theSystemMovers();
        friend frontend::Application * theApp();
-       friend graphics::Previews & thePreviews();
        friend Session & theSession();
+       friend LaTeXFonts & theLaTeXFonts();
        friend CmdDef & theTopLevelCmdDef();
        friend SpellChecker * theSpellChecker();
        friend void setSpellChecker();
-       friend void setRcGuiLanguage();
        friend void emergencyCleanup();
        friend void execBatchCommands();
        friend void lyx_exit(int exit_code);
@@ -169,8 +161,6 @@ void emergencyCleanup();
 /// \p exit_code is 0 by default, if a non zero value is passed,
 /// emergencyCleanup() will be called before exiting.
 void lyx_exit(int exit_code);
-/// Set the language defined by the user.
-void setRcGuiLanguage();
 /// Execute batch commands if available.
 void execBatchCommands();
 
@@ -178,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);
@@ -186,4 +176,3 @@ void dispatch(FuncRequest const & action, DispatchResult & dr);
 } // namespace lyx
 
 #endif // LYX_H
-