* do not ignore "requires" field in MathMacro

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 33f99241796881b735017e2a54077239ecec3eb2..6444bed8865da9d58d48b718c3247ca59d124183 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -25,16 +25,16 @@ class Buffer;
 class BufferList;
 class Converters;
 class ErrorItem;
-class InsetBase;
+class Inset;
 class LyXFunc;
-class LyXServer;
-class LyXServerSocket;
+class Server;
+class ServerSocket;
 class LyXView;
 class Messages;
 class Mover;
 class Movers;
 class Session;
-class kb_keymap;
+class KeyMap;
 
 extern bool use_gui;
 
@@ -66,19 +66,19 @@ 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;
        
        ///
        Converters & converters();
@@ -97,7 +97,7 @@ public:
        /** 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 * const updateInset(Inset const *) const;
 
        /// Execute batch commands if available.
        void execBatchCommands();
@@ -130,9 +130,9 @@ private:
        /// initial LyX set up
        bool init();
        /// set up the default key bindings
-       void defaultKeyBindings(kb_keymap * kbmap);
+       void defaultKeyBindings(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.