Typo.

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index b7fd220b85ae60358dba0538ce95ed6feae7b7b5..2a83af88c873b7132b79f0cc5da0ed118ed2ad1b 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -18,24 +18,18 @@
 
 namespace lyx {
 
-namespace support {
-class FileName;
-}
-
-class Buffer;
 class BufferList;
+class CmdDef;
 class Converters;
 class ErrorItem;
-class Inset;
+class KeyMap;
 class LyXFunc;
-class Server;
-class ServerSocket;
 class Messages;
 class Mover;
 class Movers;
+class Server;
+class ServerSocket;
 class Session;
-class KeyMap;
-class CmdDef;
 
 extern bool use_gui;
 
@@ -85,10 +79,6 @@ public:
        frontend::Application & application();
        frontend::Application const & application() const;
 
-       ///
-       KeyMap & topLevelKeymap();
-       KeyMap const & topLevelKeymap() const;
-
        ///
        CmdDef & topLevelCmdDef();
 
@@ -101,7 +91,7 @@ public:
        ///
        Messages & getGuiMessages();
        ///
-       void setGuiLanguage(std::string const & language);
+       void setRcGuiLanguage();
 
        ///
        frontend::LyXView * newLyXView();
@@ -109,9 +99,6 @@ public:
        /// Execute batch commands if available.
        void execBatchCommands();
 
-       ///
-       void addFileToLoad(std::string const &);
-
 private:
        /// noncopyable
        LyX(LyX const &);
@@ -130,10 +117,11 @@ private:
        int init(int & argc, char * argv[]);
 
        /// 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.
        */
-       void loadFiles();
+       bool loadFiles();
 
        /// initial LyX set up
        bool init();
@@ -146,8 +134,6 @@ private:
        bool queryUserLyXDir(bool explicit_userdir);
        /// read lyxrc/preferences
        bool readRcFile(std::string const & name);
-       /// read the given ui (menu/toolbar) file
-       bool readUIFile(std::string const & name, bool include = false);
        /// read the given languages file
        bool readLanguagesFile(std::string const & name);
        /// read the encodings.
@@ -173,6 +159,7 @@ private:
        friend void setMover(std::string const & fmt, std::string const & command);
        friend Movers & theSystemMovers();
        friend frontend::Application * theApp();
+       friend KeyMap & theTopLevelKeymap();
 };
 
 } // namespace lyx