* gcc does not like missing characters in keywords

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 33f99241796881b735017e2a54077239ecec3eb2..76f9d59fe3e1399e5c970c021004a92d733e05d9 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -15,30 +15,37 @@
 #define LYX_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <string>
 
 namespace lyx {
 
+namespace support {
+class FileName;
+}
+
 class Buffer;
 class BufferList;
 class Converters;
 class ErrorItem;
-class InsetBase;
+class Inset;
 class LyXFunc;
-class LyXServer;
-class LyXServerSocket;
-class LyXView;
+class Server;
+class ServerSocket;
 class Messages;
 class Mover;
 class Movers;
 class Session;
-class kb_keymap;
+class KeyMap;
+class CmdDef;
 
 extern bool use_gui;
 
-namespace frontend { class Application; }
+namespace frontend {
+class Application;
+class LyXView;
+}
 
 /// initial startup
 class LyX : boost::noncopyable {
@@ -66,20 +73,23 @@ public:
        LyXFunc & lyxFunc();
        LyXFunc const & lyxFunc() const;
        ///
-       LyXServer & server();
-       LyXServer const & server() const;
+       Server & server();
+       Server const & server() const;
        ///
-       LyXServerSocket & socket();
-       LyXServerSocket const & socket() const;
+       ServerSocket & socket();
+       ServerSocket const & socket() const;
 
        ///
        frontend::Application & application();
        frontend::Application const & application() const;
 
        ///
-       kb_keymap & topLevelKeymap();
-       kb_keymap const & topLevelKeymap() const;
-       
+       KeyMap & topLevelKeymap();
+       KeyMap const & topLevelKeymap() const;
+
+       ///
+       CmdDef & topLevelCmdDef();
+
        ///
        Converters & converters();
        Converters & systemConverters();
@@ -92,16 +102,21 @@ public:
        void setGuiLanguage(std::string const & language);
 
        ///
-       LyXView * newLyXView();
+       frontend::LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
         */
-       Buffer const * const updateInset(InsetBase const *) const;
+       Buffer const * updateInset(Inset const *) const;
+
+       void hideDialogs(std::string const & name, Inset * inset) const;
 
        /// Execute batch commands if available.
        void execBatchCommands();
 
+       ///
+       void addFileToLoad(support::FileName const &);
+
 private:
        /// Do some cleanup in preparation of an exit.
        void prepareExit();
@@ -129,10 +144,8 @@ private:
 
        /// initial LyX set up
        bool init();
-       /// set up the default key bindings
-       void defaultKeyBindings(kb_keymap * kbmap);
        /// set up the default dead key bindings if requested
-       void deadKeyBindings(kb_keymap * kbmap);
+       void deadKeyBindings(KeyMap * kbmap);
        /** Check for the existence of the user's support directory and,
         *  if not present, create it. Exits the program if the directory
         *  cannot be created.
@@ -150,7 +163,7 @@ private:
        /// \param enc_name encodings definition file
        /// \param symbols_name unicode->LaTeX mapping file
        bool readEncodingsFile(std::string const & enc_name,
-                              std::string const & symbols_name);
+                              std::string const & symbols_name);
        /// parsing of non-gui LyX options.
        void easyParse(int & argc, char * argv[]);
        /// shows up a parsing error on screen